DCKR-1: Add styles

.circleci/config.yml

@@ -15,13 +15,19 @@ jobs:
           command: echo 'source build-env' > $BASH_ENV
       # Code checkout in the build agent
       - checkout
+      # Run other commands
+      - run:
+          name: Check memory
+          command: |
+            build-exec 'free -m'
+            build-exec 'cd ../ && ls -la'
       # Launch a sandbox on the sandbox server
       - run:
           name: Build sandbox
           command: sandbox-init
       # Run other commands
       - run:
-          name: Other commands
+          name: Other2 commands
           command: |
             DEBUG=1 source build-env
             build-exec 'fin drush status'

.docksal/commands/init

@@ -40,15 +40,23 @@ sleep 10
 # Importing Database
 if [[ "$1" != "new" ]]; then
     echo -e "${green_bg} Step 2 ${NC}${green} Importing Database...${NC}"
-    #fin pull db -y
+    fin db import $PROJECT_ROOT/db/database.sql --db=default --db-user=user --db-password=user
 fi
 
 # 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 $1
 
+
+echo-yellow "Reset admin password ..."
+cd docroot && fin drush upwd --password="admin" "admin"
+
 echo -en "${green_bg} DONE! ${NC} "
-echo -e " Welcome to: ${yellow}http://${VIRTUAL_HOST}${NC}"
+echo -e " Welcome to: ${green}http://${VIRTUAL_HOST}${NC}"
+
+echo -e "Open ${yellow}http://${VIRTUAL_HOST}/user/login${NC} in your browser and login."
+echo -e "User:${yellow} admin ${NC}"
+echo -e "Pass:${yellow} admin ${NC}"
 
 #-------------------------- END: Execution --------------------------------

.docksal/commands/init-site

@@ -26,7 +26,7 @@ echo-yellow () { echo -e "${yellow}$1${NC}"; }
 # PROJECT_ROOT and DOCROOT are set as env variables in cli
 SITE_DIRECTORY="default"
 DOCROOT_PATH="${PROJECT_ROOT}/${DOCROOT}"
-THEME_PATH="${DOCROOT_PATH}/themes/custom/${THEME_NAME}/"
+THEME_PATH="${DOCROOT_PATH}/themes/custom/dckyiv/"
 SITEDIR_PATH="${DOCROOT_PATH}/sites/${SITE_DIRECTORY}"
 
 #-------------------------- END: Settings --------------------------------
@@ -84,12 +84,13 @@ composer_install ()
 {
     echo -e "${green} Installing composer...${NC}"
 	cd $PROJECT_ROOT
-	php -d memory_limit=256M /usr/local/bin/composer install --no-ansi --no-dev --no-interaction --optimize-autoloader --no-progress --prefer-dist --ignore-platform-reqs
+	php -d memory_limit=-1 /usr/local/bin/composer update drupal/allowed_formats --no-ansi --no-dev --no-interaction --optimize-autoloader --no-progress --prefer-dist --ignore-platform-reqs
 }
 
 # Import configs and run update
 import_configs ()
 {
+    echo -e "${green} Import configs and run updates...${NC}"
     cd $DOCROOT_PATH
     drush en stage_file_proxy -y
     drush cr
@@ -109,9 +110,13 @@ theme_install ()
 # Post install commands
 post_install ()
 {
-    echo -e "${yellow}http://${VIRTUAL_HOST}/user${NC}"
-    echo -e "User:${green} admin ${NC}"
-    echo -e "Pass:${green} admin ${NC}"
+    if [ "$1" == "new" ]; then
+        echo -e "${yellow}http://${VIRTUAL_HOST}/user${NC}"
+        echo -e "User:${green} admin ${NC}"
+        echo -e "Pass:${green} admin ${NC}"
+    else
+        drush uli
+    fi
 }
 #-------------------------- END: Functions --------------------------------
 
@@ -127,5 +132,6 @@ else
     import_configs
 	theme_install
 fi
-post_install
+
+#post_install
 #-------------------------- END: Execution --------------------------------

.gitignore

@@ -1,6 +1,7 @@
 # Ignore paths that contain user-generated content.
 /docroot/sites/*/files
 /docroot/sites/*/private
+/docroot/themes/custom/*/assets/css/fonts
 files/*
 
 # Avoid accidental modification of pantheon.upstream.yml in sites

composer.json

@@ -128,6 +128,7 @@
     "drupal/better_social_sharing_buttons": "^1.4",
     "drupal/captcha": "^1.0@beta",
     "drupal/chosen": "^2.7",
+    "drupal/ckwordcount": "^1.0",
     "drupal/color_field": "^2.0",
     "drupal/commerce": "2.11",
     "drupal/commerce_liqpay_gateway": "^1.0",
@@ -189,6 +190,7 @@
     "league/commonmark": "^0.11",
     "oomphinc/composer-installers-extender": "^1.1",
     "vlucas/phpdotenv": "^2.4",
+    "w8tcha/ckeditor-wordcount-plugin": "^1.17",
     "webflo/drupal-core-require-dev": "~8.7.0",
     "webflo/drupal-finder": "^1.0.0",
     "webmozart/path-util": "^2.3",
@@ -220,6 +222,7 @@
         "type:drupal-core"
       ],
       "docroot/libraries/{$name}": [
+        "w8tcha/ckeditor-wordcount-plugin",
         "type:drupal-library",
         "type:bower-asset"
       ],
@@ -247,8 +250,17 @@
       "drupal/content_moderation_notifications": {
         "Fixed To sending": "https://www.drupal.org/files/issues/2018-10-29/show-emails-3010067-1.patch"
       },
+      "drupal/better_social_sharing_buttons": {
+        "Export settings to yml": "https://www.drupal.org/files/issues/2019-03-07/export_settings_to_yml-3031046-5.patch",
+        "After click screen jump to bottom": "https://www.drupal.org/files/issues/2019-06-04/3059376-after-click-screen-jump-to-bottom-2.patch"
+      },
       "drupal/conditional_fields": {
         "Error 'explode() expects parameter": "https://www.drupal.org/files/issues/2018-04-05/conditional_fields-explode_expects_string-2898893-11.patch"
+      },
+      "drupal/widget_engine": {
+        "Doesn't work with entity_browser": "https://www.drupal.org/files/issues/2019-05-22/get_entity_browser_entity_from_form_state.patch",
+        "Remove layout changes in admin": "https://www.drupal.org/files/issues/2019-06-08/3060383-remove-layout-changes-in-admin-3.patch",
+        "Make widget edit form title more clear": "https://www.drupal.org/files/issues/2018-10-04/widget_engine-widget-entity-form-improvement-3004371-3.patch"
       }
     }
   }