Compare commits

...
Sign in to create a new pull request.

83 commits
next ... master

Author SHA1 Message Date
dependabot-preview[bot]
a5f598deff Bump tightenco/collect from 6.3.0 to 6.4.0 in /drupal
Bumps [tightenco/collect](https://github.com/tightenco/collect) from 6.3.0 to 6.4.0.
- [Release notes](https://github.com/tightenco/collect/releases)
- [Commits](https://github.com/tightenco/collect/compare/v6.3.0...v6.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-24 20:05:13 +01:00
dependabot-preview[bot]
fa56833672 Bump tightenco/collect from 6.2.0 to 6.3.0 in /drupal
Bumps [tightenco/collect](https://github.com/tightenco/collect) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/tightenco/collect/releases)
- [Commits](https://github.com/tightenco/collect/compare/v6.2.0...v6.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-24 00:55:47 +01:00
49e2ffbd8d yarn upgrade 2019-10-24 00:53:22 +01:00
f447aaccc0 Use yarn 2019-10-24 00:46:32 +01:00
dependabot-preview[bot]
bff2e2da7f Bump @vue/cli-plugin-eslint from 3.11.0 to 3.12.0 in /vuejs
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v3.12.0/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.12.0/packages/@vue/cli-plugin-eslint)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-11 19:54:35 +01:00
dependabot-preview[bot]
3b52712db6 Bump @vue/cli-service from 3.11.0 to 3.12.0 in /vuejs
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v3.12.0/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.12.0/packages/@vue/cli-service)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-11 19:54:25 +01:00
dependabot-preview[bot]
397da22b90 Bump zaporylie/composer-drupal-optimizations in /drupal
Bumps [zaporylie/composer-drupal-optimizations](https://github.com/zaporylie/composer-drupal-optimizations) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/zaporylie/composer-drupal-optimizations/releases)
- [Commits](https://github.com/zaporylie/composer-drupal-optimizations/compare/1.1.0...1.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-11 19:47:41 +01:00
dependabot-preview[bot]
76e0a83dd8 Bump @vue/cli-plugin-babel from 3.11.0 to 3.12.0 in /vuejs
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v3.12.0/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.12.0/packages/@vue/cli-plugin-babel)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-11 19:47:16 +01:00
dependabot-preview[bot]
cf9c0a5c59 Bump @vue/cli-plugin-unit-jest from 3.11.0 to 3.12.0 in /vuejs
Bumps [@vue/cli-plugin-unit-jest](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-jest) from 3.11.0 to 3.12.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/v3.12.0/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.12.0/packages/@vue/cli-plugin-unit-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-11 19:46:59 +01:00
dependabot-preview[bot]
f1f8afc115 Bump tightenco/collect from 5.8.34 to 6.2.0 in /drupal
Bumps [tightenco/collect](https://github.com/tightenco/collect) from 5.8.34 to 6.2.0.
- [Release notes](https://github.com/tightenco/collect/releases)
- [Commits](https://github.com/tightenco/collect/compare/v5.8.34...v6.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-11 19:46:35 +01:00
3996891f12
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/qs-6.9.0
Bump qs from 6.8.0 to 6.9.0 in /vuejs
2019-09-25 21:59:31 +01:00
dependabot-preview[bot]
ad331dbfff
Bump qs from 6.8.0 to 6.9.0 in /vuejs
Bumps [qs](https://github.com/ljharb/qs) from 6.8.0 to 6.9.0.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.8.0...v6.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 07:04:28 +00:00
b104522020
Merge pull request from opdavies/dependabot/composer/drupal/drupal/console-1.9.3
Bump drupal/console from 1.9.2 to 1.9.3 in /drupal
2019-09-17 08:23:53 +01:00
7549d7e842
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/fullhuman/postcss-purgecss-1.3.0
Bump @fullhuman/postcss-purgecss from 1.2.0 to 1.3.0 in /vuejs
2019-09-17 08:23:23 +01:00
dependabot-preview[bot]
a299d919c9
Bump @fullhuman/postcss-purgecss from 1.2.0 to 1.3.0 in /vuejs
Bumps [@fullhuman/postcss-purgecss](https://github.com/FullHuman/postcss-purgecss) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/FullHuman/postcss-purgecss/releases)
- [Changelog](https://github.com/FullHuman/postcss-purgecss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FullHuman/postcss-purgecss/commits/1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 06:44:54 +00:00
7971235aec Use npm 2019-09-09 20:24:43 +01:00
dependabot-preview[bot]
fff50a03b1
Bump drupal/console from 1.9.2 to 1.9.3 in /drupal
Bumps [drupal/console](https://github.com/hechoendrupal/drupal-console) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/hechoendrupal/drupal-console/releases)
- [Commits](https://github.com/hechoendrupal/drupal-console/compare/1.9.2...1.9.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 09:47:36 +00:00
78175aa087
Merge pull request from opdavies/dependabot/composer/drupal/composer/installers-1.7.0
Bump composer/installers from 1.6.0 to 1.7.0 in /drupal
2019-09-02 12:27:31 +01:00
dependabot-preview[bot]
8d03688a9f
Bump composer/installers from 1.6.0 to 1.7.0 in /drupal
Bumps [composer/installers](https://github.com/composer/installers) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/composer/installers/releases)
- [Changelog](https://github.com/composer/installers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/composer/installers/compare/v1.6.0...v1.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-02 08:49:49 +00:00
2ab5191de7
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/eslint-plugin-vue-5.2.3
Bump eslint-plugin-vue from 5.2.2 to 5.2.3 in /vuejs
2019-08-31 01:14:32 +01:00
3632326f77
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/axios-0.19.0
Bump axios from 0.18.1 to 0.19.0 in /vuejs
2019-08-31 01:14:12 +01:00
99e1560548
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/vue/cli-plugin-babel-3.11.0
Bump @vue/cli-plugin-babel from 3.7.0 to 3.11.0 in /vuejs
2019-08-31 01:13:59 +01:00
bee3f669e9
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/vue/cli-service-3.11.0
Bump @vue/cli-service from 3.7.0 to 3.11.0 in /vuejs
2019-08-31 01:13:45 +01:00
dependabot-preview[bot]
5745580fa9
Bump @vue/cli-plugin-babel from 3.7.0 to 3.11.0 in /vuejs
Bumps [@vue/cli-plugin-babel](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-babel) from 3.7.0 to 3.11.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.11.0/packages/@vue/cli-plugin-babel)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 23:48:15 +00:00
dependabot-preview[bot]
4b9f4ab85d
Bump axios from 0.18.1 to 0.19.0 in /vuejs
Bumps [axios](https://github.com/axios/axios) from 0.18.1 to 0.19.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.18.1...v0.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 23:47:46 +00:00
dependabot-preview[bot]
d0ebbf2382
Bump @vue/cli-service from 3.7.0 to 3.11.0 in /vuejs
Bumps [@vue/cli-service](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-service) from 3.7.0 to 3.11.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.11.0/packages/@vue/cli-service)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 23:47:22 +00:00
dependabot-preview[bot]
3f1fdb184b
Bump eslint-plugin-vue from 5.2.2 to 5.2.3 in /vuejs
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v5.2.2...v5.2.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 23:46:14 +00:00
f25324335b
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/axios-0.18.1
Bump axios from 0.18.0 to 0.18.1 in /vuejs
2019-08-30 20:31:55 +01:00
dependabot[bot]
ed6b741992
Bump axios from 0.18.0 to 0.18.1 in /vuejs
Bumps [axios](https://github.com/axios/axios) from 0.18.0 to 0.18.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.18.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.18.0...v0.18.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-08-30 19:31:33 +00:00
1d8b46251d
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/vue/cli-plugin-unit-jest-3.11.0
Bump @vue/cli-plugin-unit-jest from 3.7.0 to 3.11.0 in /vuejs
2019-08-30 20:16:24 +01:00
002dca6e52
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/babel-eslint-10.0.3
Bump babel-eslint from 10.0.1 to 10.0.3 in /vuejs
2019-08-30 20:16:14 +01:00
1b37bafd14
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/vue-router-3.1.3
Bump vue-router from 3.0.6 to 3.1.3 in /vuejs
2019-08-30 20:15:58 +01:00
eedc2d5dcd
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/lodash.defaultsdeep-4.6.1
[Security] Bump lodash.defaultsdeep from 4.6.0 to 4.6.1 in /vuejs
2019-08-30 20:15:44 +01:00
ac2403ff39
Merge pull request from opdavies/dependabot/composer/drupal/webflo/drupal-finder-1.2.0
Bump webflo/drupal-finder from 1.1.0 to 1.2.0 in /drupal
2019-08-30 20:15:26 +01:00
8e325b84f7
Merge pull request from opdavies/dependabot/composer/drupal/cweagans/composer-patches-1.6.7
Bump cweagans/composer-patches from 1.6.6 to 1.6.7 in /drupal
2019-08-30 20:15:13 +01:00
dependabot-preview[bot]
56bb39c7c0
[Security] Bump lodash.defaultsdeep from 4.6.0 to 4.6.1 in /vuejs
Bumps [lodash.defaultsdeep](https://github.com/lodash/lodash) from 4.6.0 to 4.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.6.0...4.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:15:02 +00:00
0fd5114e75
Merge pull request from opdavies/dependabot/composer/drupal/tightenco/collect-5.8.34
Bump tightenco/collect from 5.8.18 to 5.8.34 in /drupal
2019-08-30 20:14:53 +01:00
dependabot-preview[bot]
836b0637ba
Bump babel-eslint from 10.0.1 to 10.0.3 in /vuejs
Bumps [babel-eslint](https://github.com/babel/babel-eslint) from 10.0.1 to 10.0.3.
- [Release notes](https://github.com/babel/babel-eslint/releases)
- [Commits](https://github.com/babel/babel-eslint/compare/v10.0.1...v10.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:14:46 +00:00
dependabot-preview[bot]
3f21c779f8
Bump @vue/cli-plugin-unit-jest from 3.7.0 to 3.11.0 in /vuejs
Bumps [@vue/cli-plugin-unit-jest](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-unit-jest) from 3.7.0 to 3.11.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.11.0/packages/@vue/cli-plugin-unit-jest)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:14:43 +00:00
dependabot-preview[bot]
b430a5551d
Bump tightenco/collect from 5.8.18 to 5.8.34 in /drupal
Bumps [tightenco/collect](https://github.com/tightenco/collect) from 5.8.18 to 5.8.34.
- [Release notes](https://github.com/tightenco/collect/releases)
- [Commits](https://github.com/tightenco/collect/compare/v5.8.18...v5.8.34)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:14:10 +00:00
dependabot-preview[bot]
ea6140a60f
Bump cweagans/composer-patches from 1.6.6 to 1.6.7 in /drupal
Bumps [cweagans/composer-patches](https://github.com/cweagans/composer-patches) from 1.6.6 to 1.6.7.
- [Release notes](https://github.com/cweagans/composer-patches/releases)
- [Commits](https://github.com/cweagans/composer-patches/compare/1.6.6...1.6.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:14:06 +00:00
dependabot-preview[bot]
d1f39da25f
Bump webflo/drupal-finder from 1.1.0 to 1.2.0 in /drupal
Bumps [webflo/drupal-finder](https://github.com/webflo/drupal-finder) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/webflo/drupal-finder/releases)
- [Commits](https://github.com/webflo/drupal-finder/compare/1.1.0...1.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:13:41 +00:00
260c1317e9
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/eslint-utils-1.4.2
[Security] Bump eslint-utils from 1.3.1 to 1.4.2 in /vuejs
2019-08-30 20:13:28 +01:00
ea16b2c9c5
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/lodash-4.17.15
[Security] Bump lodash from 4.17.11 to 4.17.15 in /vuejs
2019-08-30 20:13:08 +01:00
31d53a1502
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/vue/cli-plugin-eslint-3.11.0
Bump @vue/cli-plugin-eslint from 3.7.0 to 3.11.0 in /vuejs
2019-08-30 20:12:47 +01:00
0efd71c860
Merge pull request from opdavies/dependabot/composer/drupal/drupal/console-1.9.2
Bump drupal/console from 1.8.0 to 1.9.2 in /drupal
2019-08-30 20:12:14 +01:00
04ff2c0398
Merge pull request from opdavies/dependabot/npm_and_yarn/vuejs/mixin-deep-1.3.2
[Security] Bump mixin-deep from 1.3.1 to 1.3.2 in /vuejs
2019-08-30 20:11:41 +01:00
fecbe9a8a4
Merge pull request from opdavies/dependabot/composer/drupal/drush/drush-9.7.1
Bump drush/drush from 9.6.2 to 9.7.1 in /drupal
2019-08-30 20:10:41 +01:00
dependabot-preview[bot]
27e26c0dde
Bump drush/drush from 9.6.2 to 9.7.1 in /drupal
Bumps [drush/drush](https://github.com/drush-ops/drush) from 9.6.2 to 9.7.1.
- [Release notes](https://github.com/drush-ops/drush/releases)
- [Commits](https://github.com/drush-ops/drush/compare/9.6.2...9.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:09:34 +00:00
dependabot-preview[bot]
35fd11e080
Bump @vue/cli-plugin-eslint from 3.7.0 to 3.11.0 in /vuejs
Bumps [@vue/cli-plugin-eslint](https://github.com/vuejs/vue-cli/tree/HEAD/packages/@vue/cli-plugin-eslint) from 3.7.0 to 3.11.0.
- [Release notes](https://github.com/vuejs/vue-cli/releases)
- [Changelog](https://github.com/vuejs/vue-cli/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-cli/commits/v3.11.0/packages/@vue/cli-plugin-eslint)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:08:30 +00:00
dependabot-preview[bot]
89169cb7b0
Bump vue-router from 3.0.6 to 3.1.3 in /vuejs
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.0.6 to 3.1.3.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.0.6...v3.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:08:23 +00:00
dependabot-preview[bot]
92c97b51fc
[Security] Bump lodash from 4.17.11 to 4.17.15 in /vuejs
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.15. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:07:50 +00:00
42abb9957f Import map 2019-08-30 20:06:09 +01:00
dependabot-preview[bot]
456938c18d
Bump drupal/console from 1.8.0 to 1.9.2 in /drupal
Bumps [drupal/console](https://github.com/hechoendrupal/drupal-console) from 1.8.0 to 1.9.2.
- [Release notes](https://github.com/hechoendrupal/drupal-console/releases)
- [Commits](https://github.com/hechoendrupal/drupal-console/compare/1.8.0...1.9.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 19:03:59 +00:00
f5861641f0 Require axios 2019-08-30 20:02:29 +01:00
9336a14107 Use camel case names 2019-08-30 20:02:25 +01:00
dependabot-preview[bot]
2542b49367
[Security] Bump mixin-deep from 1.3.1 to 1.3.2 in /vuejs
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.**
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 18:58:02 +00:00
dependabot-preview[bot]
09fc011ba8
[Security] Bump eslint-utils from 1.3.1 to 1.4.2 in /vuejs
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. **This update includes security fixes.**
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 18:56:37 +00:00
6725c58b80 New sessions should not be accepted 2019-08-30 19:38:20 +01:00
24a0ed9cb8 Add session status field 2019-08-30 19:24:07 +01:00
a1deab3330 Enable admin_toolbar_tools 2019-08-30 19:16:58 +01:00
bfe73f8e22 Add custom actions for sessions 2019-08-30 19:12:59 +01:00
2da4ecc893 Add rejected status for sessions 2019-08-30 19:11:52 +01:00
45f8a6a2ab Add and use vue-save-state 2019-08-30 18:08:44 +01:00
6ce41c0f0b Add and configure PurgeCSS 2019-08-30 17:57:30 +01:00
4c70965332 Use the array syntax for plugins 2019-08-30 17:44:23 +01:00
ca58883d23 Add postcss-import, split tailwind.css 2019-08-30 17:43:25 +01:00
e65b8823ed Update title 2019-08-30 17:35:26 +01:00
7d4c7fe5f3 Update tailwindcss and styling 2019-08-30 17:35:14 +01:00
a39497e8d4 Do the sorting within AcceptedSessionsList 2019-08-30 17:27:02 +01:00
15e921239e Filter on session status in the API request 2019-08-30 13:52:33 +01:00
73d4584f0a Add qa, use stringify to pass params 2019-08-30 13:50:06 +01:00
6acd746ce9 Move styles into a separate stylesheet 2019-08-30 12:55:05 +01:00
b292a34b81 Update site name 2019-06-07 07:38:19 +01:00
6a78346e1e Rebuild cache after changing uuids 2019-06-07 07:38:14 +01:00
db130a7edf Update README 2019-06-06 09:03:55 +01:00
44ad7ebcb7 Update docs 2019-06-06 08:57:53 +01:00
e385fa570f Change closing tag for consistency 2019-06-05 21:40:05 +01:00
8c7752cf43 Split Docksal init command 2019-06-05 21:29:17 +01:00
d634b835f8 Overwrite settings.php 2019-06-05 21:01:21 +01:00
dbeee034e2 Include Docksal services 2019-06-05 20:58:44 +01:00
08f29acf5c Fix confirmation message 2019-06-05 20:52:00 +01:00
985060a0a6 Fix empty title 2019-06-05 20:37:45 +01:00
30 changed files with 3775 additions and 1632 deletions

View file

@ -1,3 +1,23 @@
# Blue Conf 2019
TODO
The code for my Blue Conf 2019 talk - [Decoupling Drupal with Vue.js](https://www.oliverdavies.uk/talks/decoupling-drupal-vuejs).
## Installation
1. Clone the repository
```
git clone https://github.com/opdavies/blue-conf-2019
cd blue-conf-2019
```
1. Follow the instructions for [setting up the Drupal back-end][drupal].
1. Follow the instructions for [setting up the Vue.js front-end][vuejs].
## Author
[Oliver Davies](https://www.oliverdavies.uk)
[drupal]: /docs/setting-up-drupal.md
[vuejs]: /docs/setting-up-vue-js.md

View file

@ -1,3 +1,22 @@
# Setting up the Back-End Drupal Application
TODO
The Drupal back-end for my Blue Conf 2019 talk - [Decoupling Drupal with Vue.js](https://www.oliverdavies.uk/talks/decoupling-drupal-vuejs). This was used alongside the Vue.js front-end application for viewing and submitting fictional talk proposals that were stored in Drupal.
## Prerequisites
* [Docksal](https://docksal.io)
* [VirtualBox](https://www.virtualbox.org/wiki/Downloads) (can be changed to use Docker natively)
## Setup instructions
1. Run `fin init` to initialise the project, including installing all of the Composer dependencies, installing Drupal and importing the original configuration and creating some test content.
```bash
cd drupal
fin init
```
1. Visit `http://blueconf.docksal` to view the Drupal website, or run `fin drush status` to ensure that everything is running.
1. Run `fin drush uli` to generate a one-time login link in order to access the site.

View file

@ -1,2 +1,28 @@
# Setting up the Front-End Vue.js Application
TODO
The Vue.js front-end for my Blue Conf 2019 talk - [Decoupling Drupal with Vue.js](https://www.oliverdavies.uk/talks/decoupling-drupal-vuejs). It is a [Vue CLI](https://cli.vuejs.org) application, and uses [Tailwind CSS](https://tailwindcss.com) for styling.
## Prerequisites
* [npm](https://docs.npmjs.com/cli/npm)
* [yarn](https://yarnpkg.com) (optional)
## Setup instructions
1. Install the npm dependencies using either `npm` or `yarn`.
```bash
cd vuejs
# Using npm
npm install
# Using yarn
yarn
```
1. Change the URL to the Drupal back-end if needed in `.env`.
1. Use `yarn serve` to start a local web server.
1. Visit the URL (usually `http://localhost:8080`) to view the front-end application.

View file

@ -1,34 +1,37 @@
#!/usr/bin/env bash
## Initialise the project
## Initialize stack and site (full reset)
##
## Usage: fin init
fin start
# Abort if anything fails
set -e
fin run composer install
#-------------------------- Helper functions --------------------------------
fin drush site:install -y
# Console colors
red='\033[0;31m'
green='\033[0;32m'
green_bg='\033[1;97;42m'
yellow='\033[1;33m'
NC='\033[0m'
# Reset the site uuid.
fin drush config:set -y system.site uuid de7ba5dc-5795-4cb5-9d38-1edcc27be491
echo-red () { echo -e "${red}$1${NC}"; }
echo-green () { echo -e "${green}$1${NC}"; }
echo-green-bg () { echo -e "${green_bg}$1${NC}"; }
echo-yellow () { echo -e "${yellow}$1${NC}"; }
# Delete the uuid for shortcut.set.default so that config will import.
fin drush config:delete -y shortcut.set.default uuid
#-------------------------- Execution --------------------------------
# Import config.
fin drush config:import -y --source=../config/sync
# Stack initialization
echo -e "${green_bg} Step 1 ${NC}${green} Initializing stack...${NC}"
fin project reset -f
fin drush php:eval '\Drupal::service("Drupal\dtc_import\Service\Importer\CsvSpeakerImporter")->import()'
fin drush php:eval '\Drupal::service("Drupal\dtc_import\Service\Importer\CsvSessionImporter")->import()'
# Site initialization
echo -e "${green_bg} Step 2 ${NC}${green} Initializing site...${NC}"
# This runs inside cli using http://docs.docksal.io/en/v1.4.0/fin/custom-commands/#executing-commands-inside-cli
fin init-site
fin drush user:create api --password=api
fin drush user:role:add api_user api
echo -e "${green_bg} DONE! ${NC}${green} Completed all initialization steps.${NC}"
# Set uuid for admin user.
fin drush sql:query "UPDATE users SET uuid = '11dad4c2-baa8-4fb2-97c6-12e1ce925806' WHERE uid = 1"
# Set uuid for API user.
fin drush sql:query "UPDATE users SET uuid = '63936126-87cd-4166-9cb4-63b61a210632' WHERE uid = 7"
fin uli
#-------------------------- END: Execution --------------------------------

View file

@ -0,0 +1,85 @@
#!/usr/bin/env bash
#: exec_target = cli
## Initialize/reinstall site
##
## Usage: fin init-site
# Abort if anything fails
set -e
#-------------------------- Helper functions --------------------------------
copy_settings_file() {
local source="$1"
local dest="$2"
echo "Copying ${dest}..."
cp $source $dest
}
composer_install() {
echo "Installing Composer dependencies..."
composer install
}
#-------------------------- END: Helper functions --------------------------------
#-------------------------- END: Functions --------------------------------
init_settings() {
copy_settings_file ../files/settings.php ../../web/sites/default
}
site_install() {
composer_install
echo "Installing Drupal..."
drush site:install -y
}
import_config() {
drush config:set -y system.site uuid de7ba5dc-5795-4cb5-9d38-1edcc27be491
drush config:delete -y shortcut.set.default uuid
echo "Importing configuration..."
drush config:import -y --source=../config/sync
}
import_content() {
echo "Importing speakers from CSV..."
drush php:eval '\Drupal::service("Drupal\dtc_import\Service\Importer\CsvSpeakerImporter")->import()'
echo "Importing sessions from CSV..."
drush php:eval '\Drupal::service("Drupal\dtc_import\Service\Importer\CsvSessionImporter")->import()'
}
setup_users() {
echo "Creating the API user..."
drush user:create api --password=api
drush user:role:add api_user api
echo "Resetting uuid for the admin user..."
drush sql:query "UPDATE users SET uuid = '11dad4c2-baa8-4fb2-97c6-12e1ce925806' WHERE uid = 1"
echo "Resetting uuid for the API user..."
drush sql:query "UPDATE users SET uuid = '63936126-87cd-4166-9cb4-63b61a210632' WHERE uid = 7"
echo "Rebuilding cache..."
drush cache:rebuild
}
#-------------------------- END: Functions --------------------------------
#-------------------------- Execution --------------------------------
site_install
import_config
import_content
setup_users
echo -e "Open ${yellow}http://${VIRTUAL_HOST}${NC} in your browser to verify the setup."
#-------------------------- END: Execution --------------------------------

File diff suppressed because it is too large Load diff

View file

@ -25,7 +25,7 @@
"drupal/core": "^8.7.0",
"drush/drush": "^9.0.0",
"josephlavin/tap": "^1.0",
"tightenco/collect": "^5.8",
"tightenco/collect": "^6.2",
"vlucas/phpdotenv": "^2.4",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",

586
drupal/composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,6 @@
module:
admin_toolbar: 0
admin_toolbar_tools: 0
automated_cron: 0
basic_auth: 0
big_pipe: 0

View file

@ -19,6 +19,9 @@ settings:
-
value: accepted
label: Accepted
-
value: rejected
label: Rejected
allowed_values_function: ''
module: options
locked: false

View file

@ -0,0 +1,11 @@
uuid: 6628c7ca-bb05-487d-8953-1f935f424ccf
langcode: en
status: true
dependencies:
module:
- node
id: dtc_sessions_accept_session
label: 'Accept session'
type: node
plugin: dtc_sessions_accept_session
configuration: { }

View file

@ -0,0 +1,11 @@
uuid: 8e092524-f8ca-45f1-b093-bae311fa3694
langcode: en
status: true
dependencies:
module:
- node
id: dtc_sessions_reject_session
label: 'Reject session'
type: node
plugin: dtc_sessions_reject_session
configuration: { }

View file

@ -1,5 +1,5 @@
uuid: de7ba5dc-5795-4cb5-9d38-1edcc27be491
name: 'BlueConf'
name: 'Blue Conf'
mail: admin@example.com
slogan: ''
page:

View file

@ -2,6 +2,8 @@ uuid: f320f9b4-51c4-4a06-8289-0c5b2c1e46c5
langcode: en
status: true
dependencies:
config:
- field.storage.node.field_session_status
module:
- node
- options
@ -63,11 +65,9 @@ display:
type: type
name: name
status: status
field_session_status: field_session_status
changed: changed
edit_node: edit_node
delete_node: delete_node
dropbutton: dropbutton
timestamp: title
operations: operations
info:
node_bulk_form:
align: ''
@ -102,6 +102,13 @@ display:
separator: ''
empty_column: false
responsive: ''
field_session_status:
sortable: true
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
changed:
sortable: true
default_sort_order: desc
@ -109,30 +116,7 @@ display:
separator: ''
empty_column: false
responsive: priority-low
edit_node:
sortable: false
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
delete_node:
sortable: false
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
dropbutton:
sortable: false
default_sort_order: asc
align: ''
separator: ''
empty_column: false
responsive: ''
timestamp:
sortable: false
default_sort_order: asc
operations:
align: ''
separator: ''
empty_column: false
@ -284,6 +268,68 @@ display:
plugin_id: field
entity_type: node
entity_field: status
field_session_status:
id: field_session_status
table: node__field_session_status
field: field_session_status
relationship: none
group_type: group
admin_label: ''
label: 'Session status'
exclude: false
alter:
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
external: false
replace_spaces: false
path_case: none
trim_whitespace: false
alt: ''
rel: ''
link_class: ''
prefix: ''
suffix: ''
target: ''
nl2br: false
max_length: 0
word_boundary: true
ellipsis: true
more_link: false
more_link_text: ''
more_link_path: ''
strip_tags: false
trim: false
preserve_tags: ''
html: false
element_type: ''
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: true
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
empty: ''
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: value
type: list_default
settings: { }
group_column: value
group_columns: { }
group_rows: true
delta_limit: 0
delta_offset: 0
delta_reversed: false
delta_first_last: false
multi_type: separator
separator: ', '
field_api_classes: false
plugin_id: field
changed:
id: changed
table: node_field_data
@ -614,7 +660,8 @@ display:
- 'user.node_grants:view'
- user.permissions
max-age: 0
tags: { }
tags:
- 'config:field.storage.node.field_session_status'
page_1:
display_options:
path: admin/content/node
@ -646,4 +693,5 @@ display:
- 'user.node_grants:view'
- user.permissions
max-age: 0
tags: { }
tags:
- 'config:field.storage.node.field_session_status'

View file

@ -0,0 +1,10 @@
langcode: en
status: true
dependencies:
module:
- node
id: dtc_sessions_accept_session
label: 'Accept session'
type: node
plugin: dtc_sessions_accept_session
configuration: { }

View file

@ -0,0 +1,10 @@
langcode: en
status: true
dependencies:
module:
- node
id: dtc_sessions_reject_session
label: 'Reject session'
type: node
plugin: dtc_sessions_reject_session
configuration: { }

View file

@ -0,0 +1,25 @@
<?php
namespace Drupal\dtc_sessions\Plugin\Action;
use Drupal\Core\Field\FieldUpdateActionBase;
/**
* Accepts a session.
*
* @Action(
* id = "dtc_sessions_accept_session",
* label = @Translation("Accept session"),
* type = "node"
* )
*/
class AcceptSession extends FieldUpdateActionBase {
/**
* {@inheritdoc}
*/
protected function getFieldsToUpdate() {
return ['field_session_status' => 'accepted'];
}
}

View file

@ -0,0 +1,25 @@
<?php
namespace Drupal\dtc_sessions\Plugin\Action;
use Drupal\Core\Field\FieldUpdateActionBase;
/**
* Rejects a session.
*
* @Action(
* id = "dtc_sessions_reject_session",
* label = @Translation("Reject session"),
* type = "node"
* )
*/
class RejectSession extends FieldUpdateActionBase {
/**
* {@inheritdoc}
*/
protected function getFieldsToUpdate() {
return ['field_session_status' => 'rejected'];
}
}

View file

@ -7,3 +7,5 @@ $databases['default']['default'] = [
'username' => getenv('MYSQL_USER'),
'password' => getenv('MYSQL_PASSWORD'),
];
$settings['container_yamls'][] = __DIR__ . '/services.docksal.yml';

View file

@ -9,25 +9,29 @@
"test:unit": "vue-cli-service test:unit"
},
"dependencies": {
"axios": "^0.18.0",
"@fullhuman/postcss-purgecss": "^1.3.0",
"axios": "^0.19.0",
"core-js": "^2.6.5",
"postcss-import": "^12.0.1",
"postcss-nested": "^4.1.2",
"tailwindcss": "^1.0.1",
"qs": "^6.9.0",
"tailwindcss": "^1.1.2",
"vue": "^2.6.10",
"vue-router": "^3.0.3"
"vue-router": "^3.1.3",
"vue-save-state": "^1.2.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.7.0",
"@vue/cli-plugin-eslint": "^3.7.0",
"@vue/cli-plugin-unit-jest": "^3.7.0",
"@vue/cli-service": "^3.7.0",
"@vue/cli-plugin-babel": "^3.12.0",
"@vue/cli-plugin-eslint": "^3.12.0",
"@vue/cli-plugin-unit-jest": "^3.12.0",
"@vue/cli-service": "^3.12.0",
"@vue/eslint-config-standard": "^4.0.0",
"@vue/test-utils": "1.0.0-beta.29",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-eslint": "^10.0.3",
"babel-jest": "^23.6.0",
"eslint": "^5.16.0",
"eslint-plugin-vue": "^5.0.0",
"eslint-plugin-vue": "^5.2.3",
"vue-template-compiler": "^2.5.21"
}
}

View file

@ -1,7 +1,15 @@
module.exports = {
plugins: {
tailwindcss: {},
'postcss-nested': {},
autoprefixer: {}
}
plugins: [
require('postcss-import'),
require('tailwindcss'),
require('postcss-nested'),
require('autoprefixer'),
process.env.NODE_ENV === 'production' && require('@fullhuman/postcss-purgecss')({
content: [
'./src/**/*.vue',
'./public/index.html',
],
defaultExtractor: content => content.match(/[A-Za-z0-9-_:/]+/g) || []
})
]
}

View file

@ -1,20 +1,22 @@
<template>
<div id="app" class="antialiased min-h-screen font-sans bg-gray-100 text-black p-12">
<div class="w-full max-w-2xl mx-auto">
<accepted-sessions-list :sessions="sortedSessions" />
<session-form @submitted="addSession($event)"></session-form>
<AcceptedSessionsList :sessions="sessions"/>
<SessionForm/>
</div>
</div>
</template>
<script>
import _ from 'lodash'
import AcceptedSessionsList from '@/components/AcceptedSessionsList'
import axios from 'axios'
import qs from 'qs'
import saveState from 'vue-save-state'
import SessionForm from '@/components/SessionForm'
const axios = require('axios')
export default {
mixins: [saveState],
components: {
AcceptedSessionsList,
SessionForm
@ -30,7 +32,12 @@ export default {
mounted () {
const baseUrl = process.env.VUE_APP_DRUPAL_URL
axios.get(`${baseUrl}/jsonapi/node/session`)
const params = qs.stringify({
'fields[node--session]': 'title',
'filter[field_session_status]': 'accepted'
})
axios.get(`${baseUrl}/jsonapi/node/session?${params}`)
.then(({ data }) => {
this.loaded = true
this.sessions = data.data
@ -38,41 +45,13 @@ export default {
},
methods: {
addSession: function (session) {
this.sessions.push(session)
getSaveStateConfig () {
return {
cacheKey: 'app'
}
},
computed: {
sortedSessions: function () {
return _(this.sessions).sortBy(({ attributes }) => attributes.title)
}
}
}
</script>
<style>
@tailwind base;
h1,
h2 {
@apply font-semibold
}
input,
textarea {
@apply w-full border border-gray-400 p-2 mt-1
}
input[type=submit] {
@apply w-full;
@screen sm {
@apply w-auto
}
}
@tailwind components;
@tailwind utilities;
</style>
<style src="./assets/css/tailwind.css"></style>

View file

@ -0,0 +1,17 @@
h1,
h2 {
@apply font-semibold
}
input,
textarea {
@apply mt-1 p-2 w-full border border-gray-400
}
input[type=submit] {
@apply w-full;
@screen sm {
@apply w-auto
}
}

View file

@ -0,0 +1,6 @@
@import 'tailwindcss/base';
@import './base.css';
@import 'tailwindcss/components';
@import 'tailwindcss/utilities';

View file

@ -1,10 +1,10 @@
<template>
<div>
<h1 class="text-4xl mb-2">Sessions</h1>
<h1 class="text-4xl">Accepted Sessions</h1>
<div v-if="acceptedSessions.length" class="bg-white p-6 rounded-lg border">
<ul class="-mb-3">
<li v-for="{ attributes } in acceptedSessions" :key="attributes.drupal_internal__nid" class="mb-3">
<div v-if="sessions.length" class="mt-2 p-6 bg-white rounded-lg border">
<ul>
<li v-for="{ attributes } in sortedSessions" :key="attributes.drupal_internal__nid" class="mt-3 first:mt-0">
{{ attributes.title }}
</li>
</ul>
@ -13,25 +13,19 @@
</template>
<script>
import sortBy from 'lodash/sortBy'
export default {
props: {
sessions: {
type: Object,
type: Array,
required: true
}
},
computed: {
acceptedSessions: function () {
return this.sessions
.filter(session => this.isAccepted(session))
.value()
}
},
methods: {
isAccepted: function ({ attributes }) {
return attributes.field_session_status === 'accepted'
sortedSessions: function () {
return sortBy(this.sessions, 'attributes.title')
}
}
}

View file

@ -2,9 +2,8 @@
<section class="mt-8">
<h2 class="text-2xl mb-4">Submit a Session</h2>
<session-form-message :messages="messages" class="bg-green-100 border-green-300"></session-form-message>
<session-form-message :messages="errors" class="bg-red-100 border-red-300"></session-form-message>
<SessionFormMessage :messages="messages" class="bg-green-100 border-green-300"/>
<SessionFormMessage :messages="errors" class="bg-red-100 border-red-300"/>
<form action="" @submit.prevent="submit">
<label class="block mb-4">
@ -24,7 +23,7 @@
<script>
import axios from 'axios'
import _ from 'lodash'
import map from 'lodash/map'
import SessionFormMessage from '@/components/SessionFormMessage'
export default {
@ -37,7 +36,7 @@ export default {
errors: [],
form: {
body: '',
field_session_status: 'accepted',
field_session_status: 'submitted',
field_session_type: 'full',
title: ''
},
@ -80,19 +79,17 @@ export default {
'Authorization': 'Basic YXBpOmFwaQ==',
'Content-Type': 'application/vnd.api+json'
}
}).then(({ data: { data: { attributes } } }) => {
const title = attributes.title
this.messages.push(`Session ${title} has been created.`)
}).then(({ data }) => {
this.errors = []
this.messages = []
this.$emit('submitted', data)
const title = data.data.attributes.title
this.messages.push(`Session ${title} has been created.`)
this.form.body = ''
this.form.title = ''
this.errors = []
this.messages = []
}).catch(({ response: { data } }) => {
this.errors = _(data.errors).map('detail').value()
this.errors = map(data.errors, 'detail')
})
}
}

View file

@ -1,6 +1,6 @@
<template>
<div v-if="messages.length" class="border p-4 mb-6">
<ul class="list-disc list-inside ml-3">
<div v-if="messages.length" class="mb-6 p-4 border">
<ul class="ml-3 list-disc list-inside">
<li v-for="message in messages" :key="message">{{ message }}</li>
</ul>
</div>

9
vuejs/tailwind.config.js Normal file
View file

@ -0,0 +1,9 @@
module.exports = {
theme: {
extend: {}
},
variants: {
margin: ['responsive', 'first', 'last'],
},
plugins: []
}

File diff suppressed because it is too large Load diff