From bef289950b4ba5634855fa5978e344542c3c0a52 Mon Sep 17 00:00:00 2001 From: calcu1on Date: Sun, 23 Mar 2025 08:44:18 -0400 Subject: [PATCH] Commit current progress. --- web/modules/custom/dc_core/dc_core.module | 38 +++++-------- .../src/Drush/Commands/CharacterImport.php | 2 +- .../src/Plugin/Block/CopyrightBlock.php | 31 +++++++++++ web/modules/custom/ufc/src/Fighter.php | 3 ++ .../custom/ufc/src/Services/FightImporter.php | 3 ++ .../ufc/src/Services/FighterImporter.php | 8 +-- web/themes/custom/dchadwick/css/style.css | 35 ++++++++++++ .../src/sass/partials/lb-styles.scss | 54 +++++++++++++++++++ .../custom/dchadwick/src/sass/style.scss | 1 + 9 files changed, 145 insertions(+), 30 deletions(-) create mode 100644 web/modules/custom/dc_core/src/Plugin/Block/CopyrightBlock.php create mode 100644 web/themes/custom/dchadwick/src/sass/partials/lb-styles.scss diff --git a/web/modules/custom/dc_core/dc_core.module b/web/modules/custom/dc_core/dc_core.module index 8a831ce..7315802 100644 --- a/web/modules/custom/dc_core/dc_core.module +++ b/web/modules/custom/dc_core/dc_core.module @@ -11,29 +11,17 @@ function dc_core_page_attachments(array &$attachments) { } } -function dc_core_views_pre_view(ViewExecutable $view) { - if ($view->id() !== 'floorplans_by_property') { - return; - } - $cur_node = \Drupal::routeMatch()->getParameter('node'); - if (!$cur_node instanceof \Drupal\node\NodeInterface) { - return; - } - if (!$cur_node->hasField('field_property')) { - return; - } - // current property. - $property = $cur_node->get('field_property')->first()->getValue()['target_id'] ?? FALSE; - assert(!is_null($property)); - - $increased_price_data = [ - - ]; - $exposed_input = $view->getExposedInput(); - if (isset($exposed_input['field_price_value'])) { - $filters = $view->display_handler->getOption('filters'); - $filters['field_price_value']['group_info']['group_items'][3]['title'] = "339+"; - $filters['field_price_value']['group_info']['group_items'][3]['value']['value'] = 339; - $view->display_handler->overrideOption('filters', $filters); - } +function dc_core_form_taxonomy_term_ufc_events_form_alter(&$form, &$form_state, $form_id) { + $form['actions']['refresh'] = array( + '#type' => 'submit', + '#value' => t('Refresh Property'), + '#access' => TRUE, + '#submit' => ['dc_core_taxo_form_submit'], + '#weight' => -30, + ); } + +function dc_core_taxo_form_submit($form, &$form_state) { + +} + diff --git a/web/modules/custom/dc_core/src/Drush/Commands/CharacterImport.php b/web/modules/custom/dc_core/src/Drush/Commands/CharacterImport.php index 536b6d2..23ad88e 100644 --- a/web/modules/custom/dc_core/src/Drush/Commands/CharacterImport.php +++ b/web/modules/custom/dc_core/src/Drush/Commands/CharacterImport.php @@ -15,7 +15,7 @@ final class CharacterImport extends DrushCommands { public function importCharacters(): void { $http_client = \Drupal::httpClient(); $character_endpoint = "https://dchadwick.ddev.site/api/character-list"; - $data = $http_client->get($character_endpoint)->getBody()->getContents(); + $data = $http_client->get($character_endpoint, ['verify'=>FALSE,])->getBody()->getContents(); $json_data = json_decode($data, TRUE); // Create the queue. $character_import_queue = \Drupal::queue('character_import'); diff --git a/web/modules/custom/dc_core/src/Plugin/Block/CopyrightBlock.php b/web/modules/custom/dc_core/src/Plugin/Block/CopyrightBlock.php new file mode 100644 index 0000000..c87b286 --- /dev/null +++ b/web/modules/custom/dc_core/src/Plugin/Block/CopyrightBlock.php @@ -0,0 +1,31 @@ +© Dan Chadwick {$year}

"; + $build = [ + '#markup' => "

© Dan Chadwick {$year}

", + ]; + + return $build; + } + +} diff --git a/web/modules/custom/ufc/src/Fighter.php b/web/modules/custom/ufc/src/Fighter.php index eaf3a3f..1fd5304 100644 --- a/web/modules/custom/ufc/src/Fighter.php +++ b/web/modules/custom/ufc/src/Fighter.php @@ -107,6 +107,9 @@ public function setFighterPage(string $url): void { * Checks is the fighters has stats to pull before proceeding. */ public function checkValidFighter(): bool { + if (!$this->crawler) { + return FALSE; + } $athlete_stats = $this->crawler->filter('h2.stats-records__title')->count(); if ($athlete_stats == 0) { return FALSE; diff --git a/web/modules/custom/ufc/src/Services/FightImporter.php b/web/modules/custom/ufc/src/Services/FightImporter.php index 074d307..8a3036a 100644 --- a/web/modules/custom/ufc/src/Services/FightImporter.php +++ b/web/modules/custom/ufc/src/Services/FightImporter.php @@ -163,6 +163,9 @@ private function removeExistingEvents(): void { */ public static function createFightsByEvent($event, $context): void { try { + /* \Drupal::messenger()->addStatus(print_r($event->field_event_url->uri)); */ + /* \Drupal::messenger()->addStatus(print_r($event->label())); */ + /* exit(); */ $event_page_html = \Drupal::httpClient() ->get(self::EVENT_BASE . $event->field_event_url->uri) ->getBody()->getContents(); diff --git a/web/modules/custom/ufc/src/Services/FighterImporter.php b/web/modules/custom/ufc/src/Services/FighterImporter.php index 90bb9fe..1fd7bbb 100644 --- a/web/modules/custom/ufc/src/Services/FighterImporter.php +++ b/web/modules/custom/ufc/src/Services/FighterImporter.php @@ -98,9 +98,9 @@ public function importFighters(): void { else { $fighters_by_div = self::getListOfCurrentFighters(); // Process each fighter into system. - /* foreach ($fighters_by_div as $division => $fighters) { */ - /* $this->processDivision($division, $fighters); */ - /* } */ + foreach ($fighters_by_div as $division => $fighters) { + $this->processDivision($division, $fighters); + } } } /** @@ -109,7 +109,7 @@ public function importFighters(): void { * @param mixed $div * @param mixed $fighters */ - public static function processDivision($div, $fighters, &$context): void { + public static function processDivision($div, $fighters): void { \Drupal::logger('ufc')->notice("Starting to update $div"); foreach ($fighters as $fighter_data) { diff --git a/web/themes/custom/dchadwick/css/style.css b/web/themes/custom/dchadwick/css/style.css index f1ca3e9..58abf39 100644 --- a/web/themes/custom/dchadwick/css/style.css +++ b/web/themes/custom/dchadwick/css/style.css @@ -601,6 +601,41 @@ table.cols-5 td.incorrect { line-height: 24px; } +.margin-1 { + margin: 1rem; +} +.margin-2 { + margin: 2rem; +} + +.m-top-1 { + margin-top: 1rem; +} +.m-top-2 { + margin-top: 2rem; +} + +.m-bottom-1 { + margin-bottom: 1rem; +} +.m-bottom-2 { + margin-bottom: 2rem; +} + +.padding-1 { + padding: 1rem; +} +.padding-2 { + padding: 2rem; +} + +.p-topbottom-1 { + padding: 1rem 0; +} +.p-topbottom-2 { + padding: 2rem 0; +} + html { font-size: 100%; box-sizing: border-box; diff --git a/web/themes/custom/dchadwick/src/sass/partials/lb-styles.scss b/web/themes/custom/dchadwick/src/sass/partials/lb-styles.scss new file mode 100644 index 0000000..330da51 --- /dev/null +++ b/web/themes/custom/dchadwick/src/sass/partials/lb-styles.scss @@ -0,0 +1,54 @@ +.margin { + &-1 { + margin: 1rem; + } + + &-2 { + margin: 2rem; + } +} + +.m-top { + &-1 { + margin-top: 1rem; + } + + &-2 { + margin-top: 2rem; + } +} + +.m-bottom { + &-1 { + margin-bottom: 1rem; + } + + &-2 { + margin-bottom: 2rem; + } +} + +.padding { + + &-1 { + padding: 1rem; + } + + &-2 { + padding: 2rem; + } + +} + +.p-topbottom { + + &-1 { + padding: 1rem 0; + + } + + &-2 { + padding: 2rem 0; + } + +} diff --git a/web/themes/custom/dchadwick/src/sass/style.scss b/web/themes/custom/dchadwick/src/sass/style.scss index a0e173f..7d17342 100644 --- a/web/themes/custom/dchadwick/src/sass/style.scss +++ b/web/themes/custom/dchadwick/src/sass/style.scss @@ -49,6 +49,7 @@ $container-plus-padding: 1216px; @import "partials/article"; @import "partials/breadcrumbs"; @import "partials/characters"; +@import "partials/lb-styles"; html { font-size: 100%;