Cli refactor

.github/workflows/docs.yml

@@ -8,9 +8,7 @@ on:
 jobs:
   build-deploy:
     name: Build and deploy docs
-
     runs-on: ubuntu-latest
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/generate-linter-advanced.yml

@@ -5,13 +5,13 @@ on:
   workflow_dispatch: {}
 
 jobs:
-  framework_matrix:
+  blueprint_matrix:
     strategy:
       matrix:
-        framework: [chi, gin, fiber, gorilla/mux, httprouter, standard-library, echo]
+        backend: [chi, gin, fiber, gorilla/mux, httprouter, standard-library, echo]
         driver: [postgres]
         git: [commit]
-        advanced: [htmx, githubaction, websocket, tailwind, docker, react]
+        advanced: [githubaction, websocket, docker]
 
     runs-on: ubuntu-latest
     steps:
@@ -30,18 +30,12 @@ jobs:
           git config --global user.name 'testname'
           git config --global user.email '[email protected]'
 
-      - name: Set framework variable
-        id: set-proejct-directory
-        run: echo "PROJECT_DIRECTORY=${{ matrix.framework }}" | sed 's/\//-/g' >> $GITHUB_ENV
+      - name: Set dir variable
+        id: set-project-directory
+        run: echo "PROJECT_DIRECTORY=${{ matrix.backend }}" | sed 's/\//-/g' >> $GITHUB_ENV
 
       - name: build templates
-        run: script -q /dev/null -c "go run main.go create -n ${{ env.PROJECT_DIRECTORY }} -f ${{ matrix.framework}} -d ${{ matrix.driver }} -g ${{ matrix.git}} --advanced --feature ${{ matrix.advanced }}"
-
-      - if: ${{ matrix.advanced == 'htmx' || matrix.advanced == 'tailwind' }}
-        name: Install Templ & gen templates
-        run: | 
-          go install github.com/a-h/templ/cmd/templ@latest
-          /home/runner/go/bin/templ generate -path ${{ env.PROJECT_DIRECTORY }}
+        run: script -q /dev/null -c "go run main.go create -n ${{ env.PROJECT_DIRECTORY }} -b ${{ matrix.backend}} -d ${{ matrix.driver }} -g ${{ matrix.git}} -a --feature ${{ matrix.advanced }}"
 
       - name: golangci-lint
         run: | 

.github/workflows/generate-linter-core.yml

@@ -5,10 +5,10 @@ on:
   workflow_dispatch: {}
 
 jobs:
-  framework_matrix:
+  blueprint_matrix:
     strategy:
       matrix:
-        framework: [chi, gin, fiber, gorilla/mux, httprouter, standard-library, echo]
+        backend: [chi, gin, fiber, gorilla/mux, httprouter, standard-library, echo]
         driver: [mysql, postgres, sqlite, mongo, redis, scylla, none]
         git: [commit, stage, skip]
 
@@ -29,12 +29,12 @@ jobs:
           git config --global user.name 'testname'
           git config --global user.email '[email protected]'
 
-      - name: Set framework variable
-        id: set-proejct-directory
-        run: echo "PROJECT_DIRECTORY=${{ matrix.framework }}" | sed 's/\//-/g' >> $GITHUB_ENV
+      - name: Set dir variable
+        id: set-project-directory
+        run: echo "PROJECT_DIRECTORY=${{ matrix.backend }}" | sed 's/\//-/g' >> $GITHUB_ENV
 
       - name: build templates
-        run: script -q /dev/null -c "go run main.go create -n ${{ env.PROJECT_DIRECTORY }} -f ${{ matrix.framework}} -d ${{ matrix.driver }} -g ${{ matrix.git}}"
+        run: script -q /dev/null -c "go run main.go create -n ${{ env.PROJECT_DIRECTORY }} -b ${{ matrix.backend}} -d ${{ matrix.driver }} -g ${{ matrix.git}}"
 
       - name: golangci-lint
         run: | 

.github/workflows/generate-linter-frontend.yml

@@ -0,0 +1,54 @@
+name: Linting Generated Blueprints Advanced
+
+on:
+  pull_request: {}
+  workflow_dispatch: {}
+
+jobs:
+  blueprint_matrix:
+    strategy:
+      matrix:
+        backend: [chi, gin, fiber, gorilla/mux, httprouter, standard-library, echo]
+        driver: [postgres]
+        git: [commit]
+        advanced: [docker]
+        frontendFramework: [htmx, react]
+        frontendAdvanced: [tailwind]
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23.x'
+
+      - name: Install golangci-lint
+        run: go install github.com/golangci/golangci-lint/cmd/[email protected]
+
+      - name: Commit report
+        run: |
+          git config --global user.name 'testname'
+          git config --global user.email '[email protected]'
+
+      - name: Set dir variable
+        id: set-project-directory
+        run: echo "PROJECT_DIRECTORY=${{ matrix.backend }}" | sed 's/\//-/g' >> $GITHUB_ENV
+
+      - name: build templates
+        run: script -q /dev/null -c "go run main.go create -n ${{ env.PROJECT_DIRECTORY }} -b ${{ matrix.backend}} -d ${{ matrix.driver }} -g ${{ matrix.git}} -a --feature ${{ matrix.advanced }} -f ${{ matrix.frontendFramework }} --frontend-advanced ${{ matrix.frontendAdvanced}}"
+
+      - if: ${{ matrix.frontendFramework == 'htmx'}}
+        name: Install Templ & gen templates
+        run: |
+          go install github.com/a-h/templ/cmd/templ@latest
+          /home/runner/go/bin/templ generate -path ${{ env.PROJECT_DIRECTORY }}
+
+      - name: golangci-lint
+        run: | 
+          cd ${{ env.PROJECT_DIRECTORY }}
+          golangci-lint run
+
+      - name: remove templates
+        run: rm -rf ${{ env.PROJECT_DIRECTORY }}

.github/workflows/update-htmx-version.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Get version from file
         id: get_version_file
         run: |
-          VERSION_FILE=$(curl -s https://raw.githubusercontent.com/Melkeydev/go-blueprint/main/cmd/template/advanced/files/htmx/htmx.min.js.tmpl | grep version | awk -F'"' '{print "v" $2}')
+          VERSION_FILE=$(curl -s https://raw.githubusercontent.com/Melkeydev/go-blueprint/main/cmd/template/frontend/files/htmx/htmx.min.js.tmpl | grep version | awk -F'"' '{print "v" $2}')
           echo "version file: $VERSION_FILE"
           if [[ "$VERSION_FILE" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
             echo "version_file=$VERSION_FILE" >> $GITHUB_OUTPUT
@@ -47,27 +47,27 @@ jobs:
 
       - name: dump latest htmx version
         if: steps.compare_versions.outputs.release_changed == 'true'
-        run: curl -L https://github.com/bigskysoftware/htmx/releases/latest/download/htmx.min.js -o cmd/template/advanced/files/htmx/htmx.min.js
+        run: curl -L https://github.com/bigskysoftware/htmx/releases/latest/download/htmx.min.js -o cmd/template/frontend/files/htmx/htmx.min.js
 
       - name: Prettify code
         if: steps.compare_versions.outputs.release_changed == 'true'
         run: |
           npm install --save-dev --save-exact prettier
-          npx prettier --write cmd/template/advanced/files/htmx/htmx.min.js
+          npx prettier --write cmd/template/frontend/files/htmx/htmx.min.js
           rm -rf node_modules
           rm package-lock.json
           rm package.json
 
       - name: Create tmpl after Prettify
         if: steps.compare_versions.outputs.release_changed == 'true'
-        run: mv cmd/template/advanced/files/htmx/htmx.min.js cmd/template/advanced/files/htmx/htmx.min.js.tmpl
+        run: mv cmd/template/frontend/files/htmx/htmx.min.js cmd/template/frontend/files/htmx/htmx.min.js.tmpl
 
       - name: Create Pull Request
         if: steps.compare_versions.outputs.release_changed == 'true'
         uses: peter-evans/create-pull-request@v6
         with:
-          commit-message: update htmx version ${{ steps.get_version_api.outputs.version_api }}
+          commit-message: update htmx ${{ steps.get_version_api.outputs.version_api }}
           title: Update htmx to version ${{ steps.get_version_api.outputs.version_api }} [Bot]
-          body: New htmx ${{ steps.get_version_api.outputs.version_api }} version is available. This is an automatic PR to update changes.
+          body: New htmx ${{ steps.get_version_api.outputs.version_api }} is available. This is an automatic PR to update changes.
           branch: htmx-version-update
           base: main

.gitignore

@@ -1,2 +1,9 @@
 go-blueprint
+main
+
 site
+
+*templ.go
+output.css
+tailwindcss
+tmp/