fix: deploy pipeline

Reviewed-on: #14

.ddev/config.yaml

@@ -15,6 +15,12 @@ web_environment:
   - TYPO3_CONTEXT=Development/Ddev
 corepack_enable: false
 
+hooks:
+  post-start:
+    - exec-host: |
+        ddev npm install
+        ddev npm run build:css -- --watch &
+
 # Key features of DDEV's config.yaml:
 
 # name: <projectname> # Name of the project, automatically provides

.ddev/docker-compose.override.yaml

@@ -1,9 +0,0 @@
-version: '3.6'
-services:
-  web:
-    # Install needed dependencies and run webpack in watch mode
-    command: /bin/sh -c "npm install && npm run build:css -- --watch"
-    volumes:
-      - ../packages/base:/var/www/html/packages/base
-    environment:
-      - NODE_ENV=development

.gitea/workflows/build.yaml

@@ -1,3 +1,4 @@
+
 name: Build
 
 on:
@@ -26,7 +27,7 @@ jobs:
 
       - name: Run composer install if composer.json exists
         run: | 
-          rm composer.lock
+          [ -f composer.lock ] && rm composer.lock
           composer validate --no-check-publish
 
       - name: Set up Node.js

.gitignore

@@ -17,4 +17,3 @@ nbproject
 /public
 /packages/base/Resources/Public/Css
 /node_modules
-composer.lock

build/deploy.php

@@ -56,7 +56,7 @@ set('rsync', [
 ]);
 
 task('typo3:extension:setup', function () {
-    cd('{{release_path}}');
+    cd('current');
     run('{{bin/php}} bin/typo3 extension:setup');
 });
 
@@ -94,7 +94,6 @@ task('release:create', [
     'deploy:vendors',
     'deploy:shared',
     'deploy:writable',
-    'typo3:extension:setup',
     'deploy:unlock',
     'deploy:success'
 ]);
@@ -104,6 +103,7 @@ task('release:switch', [
     'php:reload',
     'php:reload-prod',
     'typo3:cache:flush',
+    'typo3:extension:setup',
     'typo3:language:update',
     'typo3:cache:warmup',
     'deploy:unlock',
@@ -117,11 +117,11 @@ task('deploy', [
     'deploy:vendors',
     'deploy:shared',
     'deploy:writable',
+    'typo3:cache:flush',
     'typo3:extension:setup',
     'deploy:symlink',
     'php:reload',
     'php:reload-prod',
-    'typo3:cache:flush',
     'typo3:language:update',
     'typo3:cache:warmup',
     'deploy:unlock',

env.example

@@ -0,0 +1,25 @@
+TYPO3_BE_INSTALL_TOOL_PASSWORD='$2y$12$yq4Jthe0jUyf69KuOY3Udeb4yKPdE2QZ42obVCPTzhLXEcNShXXk2'
+
+# DB
+TYPO3_DB_HOST='db'
+TYPO3_DB_NAME='db'
+TYPO3_DB_USER='db'
+TYPO3_DB_PASSWORD='db'
+TYPO3_DB_UNIX_SOCKET=''
+TYPO3_DB_PORT=3306
+
+# MAIL
+TYPO3_MAIL_TRANSPORT='smtp'
+TYPO3_MAIL_SMTP_SERVER='localhost:1025'
+TYPO3_MAIL_SMTP_ENCRYPT=''
+TYPO3_MAIL_SMTP_USER=''
+TYPO3_MAIL_SMTP_PASSWORD=''
+
+# Solr
+SOLR_ENABLED_READ=true
+SOLR_HOST=solr
+SOLR_PATH=/
+SOLR_PORT=8983
+SOLR_SCHEME=http
+SOLR_CORE_NAME_DE=core_de
+SOLR_CORE_NAME_EN=core_en

meeting.md

@@ -0,0 +1,56 @@
+## Einleitung
+
+## Hosting
+bei mir
+
+## Wartungsvertrag
+bei mir
+
+
+## Webseite
+https://actionnetwork.org/ einbinden in webseite einbinden
+2 dinge anbieten, mit design und gut integriert.
+oder custom html element
+
+### content element html
+anbieten, als inhaltselement
+
+rechnung für hosting schicken 2025
+wartungsvertrag ende des jahres verrechnen
+
+
+visuell attraktive möglichkeit um zu visualisieren wie das budget ausgegeben
+wird in verschiedenen kategorien, je quartal
+https://thomaswaitz.eu/language/de/transparenz/
+flexible variante:
+3 Content Elemente:
+- Tab Element
+- Accordion Element
+- Pie Chart Element
+6 Tage / 6720€
+
+nicht flexible variante:
+transparenz element
+man kann jahre hinzufügen, je jahr kann man quartale hinzufügen und deren pie chart bearbeiten
+3,5 Tage / 3920€
+
+nur pie chart element:
+es müsste mit unterseiten gearbeitet werden je jahr und dort ein pie chart je quartal
+2 Tage / 2240€
+
+
+action network
+komm einfach ins netzwerk variante: https://fyeg.org/
+einzelne aktionen https://fyeg.org/news/paul-watson
+design anpassen optional
+schätzung machen
+einbindung einer kampagne wie:
+<link href='https://actionnetwork.org/css/style-embed-v3.css' rel='stylesheet' type='text/css' /><script src='https://actionnetwork.org/widgets/v5/form/mach-mit-beim-kampf-furs-klima-und-gegen-rechts?format=js&source=widget'></script><div id='can-form-area-mach-mit-beim-kampf-furs-klima-und-gegen-rechts' style='width: 100%'><!-- this div is the target for our HTML insertion --></div>
+2 Tage / 2240€
+
+optional css styling anpassen:
+1 Tag / 1120€
+
+
+email hosting angebot
+für hello@lena-schilling.at

packages/base/Configuration/ContentSecurityPolicies.php

@@ -13,10 +13,40 @@ use TYPO3\CMS\Core\Security\ContentSecurityPolicy\UriValue;
 use TYPO3\CMS\Core\Type\Map;
 
 return Map::fromEntries([
-    // Provide declarations for the backend
+    // Frontend CSP configuration for Action Network widget
-    Scope::backend(),
+    Scope::frontend(),
-    // NOTICE: When using `MutationMode::Set` existing declarations will be overridden
+    new MutationCollection(
+        // Base security settings
+        new Mutation(
+            MutationMode::Set,
+            Directive::DefaultSrc,
+            SourceKeyword::self,
+        ),
+        // Allow scripts from Action Network
+        new Mutation(
+            MutationMode::Extend,
+            Directive::ScriptSrc,
+            SourceKeyword::self,
+            new UriValue('https://actionnetwork.org'),
+        ),
+        // Allow styles from Action Network
+        new Mutation(
+            MutationMode::Extend,
+            Directive::StyleSrc,
+            SourceKeyword::self,
+            new UriValue('https://actionnetwork.org'),
+        ),
+        // Allow images from Action Network
+        new Mutation(
+            MutationMode::Extend,
+            Directive::ImgSrc,
+            SourceKeyword::self,
+            new UriValue('https://actionnetwork.org'),
+        ),
+    ),
 
+    // Backend configuration
+    Scope::backend(),
     new MutationCollection(
         // Results in `default-src 'self'`
         new Mutation(
@@ -34,15 +64,10 @@ return Map::fromEntries([
             SourceScheme::data,
             new UriValue('https://*.typo3.org'),
         ),
-        // NOTICE: the following two instructions for `Directive::ImgSrc` are identical to the previous instruction,
-        // `MutationMode::Extend` is a shortcut for `MutationMode::InheritOnce` and `MutationMode::Append`
-        // new Mutation(MutationMode::InheritOnce, Directive::ImgSrc, SourceScheme::data),
-        // new Mutation(MutationMode::Append, Directive::ImgSrc, SourceScheme::data, new UriValue('https://*.typo3.org')),
 
         // Extends the ancestor directive ('default-src'),
         // thus reuses 'self' and adds additional sources
         // Results in `script-src 'self' 'nonce-[random]'`
-        // ('nonce-proxy' is substituted when compiling the policy)
         new Mutation(
             MutationMode::Extend,
             Directive::ScriptSrc,

packages/base/Resources/Public/JavaScript/main.js

@@ -1 +0,0 @@
-console.log('WE LOVE TYPO3');