#61 Base changes

404.php

@@ -10,4 +10,4 @@
  */
 
 $context = Timber::context();
-Timber::render( '404.twig', $context );
+Timber::render( 'templates/404.twig', $context );

PROJECT_README.sample.md

@@ -0,0 +1,70 @@
+# PROJECT TITLE (PROJECT_NAME)
+
+[![CircleCI](https://circleci.com/gh/thinkshout/PROJECT_NAME.svg?style=shield)](https://circleci.com/gh/thinkshout/PROJECT_NAME)
+[![Dashboard PROJECT_NAME](https://img.shields.io/badge/dashboard-PROJECT_NAME-yellow.svg)](https://dashboard.pantheon.io/sites/cd61a3d0-9e13-4664-9fea-db0831e5e3f5#dev/code)
+[![Dev Site PROJECT_NAME](https://img.shields.io/badge/site-PROJECT_NAME-blue.svg)](http://dev-PROJECT_NAME.pantheonsite.io/)
+
+## Requirements
+
+Composer, terminus, and wp-cli (`brew install wp-cli`).
+
+## Site setup
+
+```sh
+git clone [email protected]:thinkshout/PROJECT_NAME.git
+cd PROJECT_NAME
+cp .env.sample .env
+composer install
+```
+
+Generate salts (https://roots.io/salts.html) and paste into your `.env` file. If your database user or password doesn't
+match the ones provided by default, change them.
+
+Then create the database:
+
+```
+wp db create
+```
+
+## Clone DB if this is an existing site or build actively in progress(optional)
+Download and extract a database backup from Pantheon:
+
+```sh
+wget -O vendor/database.sql.gz $(terminus backup:get PROJECT_NAME.dev --element=database)
+gunzip vendor/database.sql.gz
+```
+
+Import the database:
+
+```sh
+wp db import vendor/database.sql
+```
+
+The project should have its login credentials in TS 1Password. However, if you'd like to make your local copy less annoying to login to (optional):
+
+```sh
+wp user update ts_admin --user_pass=PROJECT_NAME
+```
+
+## Login
+Log in to your site: https://web.PROJECT_NAME.localhost/wp/wp-admin/
+Username: `ts_admin`
+Password: `PROJECT_NAME`
+
+## Committing code -- do this regularly
+Each time you start a new task, you should create a branch from `develop` with the github ticket number and a short
+description of the ticket's goal in the branch:
+
+```
+git checkout main
+git pull
+git checkout -b issue-123-short-description
+```
+
+Now work on your changes. Make sure configuration changes are saved in the codebase.
+
+Once you're happy with your changes, create a pull request from your branch to the `develop` branch in github
+and tag the tech lead or PM in the PR. Also move your ticket into the "Tech Review" column on [Zenhub](https://github.com/thinkshout/hsus#workspaces/).
+Someone will then review the PR for potential improvements or fixes, and merge, and move the ticket into the "Ready to deploy"
+column in [Zenhub](https://github.com/thinkshout/hsus#workspaces/). This ticket is now ready to go out with
+the next release.

README.md

@@ -7,17 +7,16 @@ This is forked from the "_s" for Timber: a dead-simple theme that you can build
 
 In `assets` you'll find `css/`, `js/`, and `static/` is where you can keep your static front-end scripts, styles, or images. In other words, your CSS files, JS files, fonts, and SVGs would live here.
 
+In `tokens` you'll find base level theme variables for colors, fonts, and spacing. These are used to generate the Tailwind config file and are also used to generate the CSS custom properties file. These files are generated by the `npm run format` command.
+
 `views/` contains all of your Twig templates. These pretty much correspond 1 to 1 with the PHP files that respond to the WordPress template hierarchy. At the end of each PHP template, you'll notice a `Timber::render()` function whose first parameter is the Twig file where that data [or `$context`] will be used. Just an FYI.
 
 ## Installation
 Getting started you will need to install theme dependencies with [nvm](https://github.com/nvm-sh/nvm#installing-and-updating), [npm](https://docs.npmjs.com/), and [composer](https://getcomposer.org/).
 
 1. Navigate to the theme directory in your project folder.
 2. Run `composer require timber/timber` to install Timber in the site, if prompted use the existing `composer.json` file in the project root directory. For more information on using Twig in WordPress see our [wiki article](https://github.com/thinkshout/thinkwp-starter-theme/wiki/TWIG-In-WordPress)
-3. If using custom Gutenberg blocks with ACF run `composer require palmiak/timber-acf-wp-blocks` and add the following line to the constructor of the theme class in [class-theme.php](https://github.com/thinkshout/thinkwp-starter-theme/blob/main/lib/class-theme.php).
-```php
-new Timber_Acf_Wp_Blocks(); // Register blocks in views/blocks with ACF.
-```
+3. If using custom Gutenberg blocks with ACF run `composer require palmiak/timber-acf-wp-blocks`. For more information refer to the [Timber ACF Blocks documentation](https://palmiak.github.io/timber-acf-wp-blocks/#/).
 4. Run `npm install` to install dependencies. Install will check the node version against the `.nvmrc` file, install all dependencies, and populate an initial set of token definitions.
 
 ## Theme Development
@@ -53,3 +52,4 @@ External docs for relevant theme technologies:
 - [WordPress](https://wordpress.org)
 - [Tailwind CSS](https://tailwindcss.com/)
 - [Timber](https://timber.github.io/docs/)
+- [Timber ACF Blocks](https://palmiak.github.io/timber-acf-wp-blocks/#/)

acf-json/group_60be1fcea8ba4.json

@@ -1,12 +1,13 @@
 {
     "key": "group_60be1fcea8ba4",
-    "title": "Hero Section",
+    "title": "Model - Banner",
     "fields": [
         {
-            "key": "field_60be1fee8b5e6",
-            "label": "Hero",
-            "name": "hero",
-            "type": "group",
+            "key": "field_650b2c1a8b8de",
+            "label": "Banner Presentation",
+            "name": "block_presentation",
+            "aria-label": "",
+            "type": "select",
             "instructions": "",
             "required": 0,
             "conditional_logic": 0,
@@ -15,68 +16,75 @@
                 "class": "",
                 "id": ""
             },
+            "choices": {
+                "left": "Text on Left",
+                "right": "Text on Right",
+                "center": "Text in the Center",
+                "floating": "Text floating over Image"
+            },
+            "default_value": false,
+            "return_format": "value",
+            "multiple": 0,
+            "allow_null": 0,
+            "ui": 0,
+            "ajax": 0,
+            "placeholder": ""
+        },
+        {
+            "key": "field_65137b4beef68",
+            "label": "Banner Title",
+            "name": "block_title",
+            "aria-label": "",
+            "type": "clone",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "clone": [
+                "group_651379242e4f5"
+            ],
+            "display": "seamless",
             "layout": "block",
-            "sub_fields": [
-                {
-                    "key": "field_60be20f18b5e8",
-                    "label": "Hero Title",
-                    "name": "hero_title",
-                    "type": "text",
-                    "instructions": "The displayed title of the page. Overrides the post\/page title.",
-                    "required": 0,
-                    "conditional_logic": 0,
-                    "wrapper": {
-                        "width": "",
-                        "class": "",
-                        "id": ""
-                    },
-                    "default_value": "",
-                    "placeholder": "",
-                    "prepend": "",
-                    "append": "",
-                    "maxlength": ""
-                },
-                {
-                    "key": "field_60be204b8b5e7",
-                    "label": "Hero Image",
-                    "name": "hero_image",
-                    "type": "image",
-                    "instructions": "Display this image atop of the page. Overrides the featured image on a post if set.",
-                    "required": 0,
-                    "conditional_logic": 0,
-                    "wrapper": {
-                        "width": "",
-                        "class": "",
-                        "id": ""
-                    },
-                    "return_format": "array",
-                    "preview_size": "large",
-                    "library": "all",
-                    "min_width": "",
-                    "min_height": "",
-                    "min_size": "",
-                    "max_width": "",
-                    "max_height": "",
-                    "max_size": "",
-                    "mime_types": ""
-                }
-            ]
+            "prefix_label": 0,
+            "prefix_name": 0
+        },
+        {
+            "key": "field_651715c054092",
+            "label": "Banner Image",
+            "name": "image",
+            "aria-label": "",
+            "type": "image",
+            "instructions": "",
+            "required": 0,
+            "conditional_logic": 0,
+            "wrapper": {
+                "width": "",
+                "class": "",
+                "id": ""
+            },
+            "return_format": "array",
+            "library": "all",
+            "min_width": "",
+            "min_height": "",
+            "min_size": "",
+            "max_width": "",
+            "max_height": "",
+            "max_size": "",
+            "mime_types": "",
+            "preview_size": "medium"
         }
     ],
     "location": [
         [
             {
                 "param": "post_type",
-                "operator": "==",
+                "operator": "!=",
                 "value": "post"
             }
-        ],
-        [
-            {
-                "param": "post_type",
-                "operator": "==",
-                "value": "page"
-            }
         ]
     ],
     "menu_order": 0,
@@ -85,7 +93,8 @@
     "label_placement": "top",
     "instruction_placement": "label",
     "hide_on_screen": "",
-    "active": true,
+    "active": false,
     "description": "",
-    "modified": 1627669094
-}
+    "show_in_rest": 0,
+    "modified": 1696012051
+}