MEO 15/04-2026 #1

.ask/.gitignore

@@ -0,0 +1,4 @@
+build
+secrets.json
+secrets.*.json
+!secrets.sample.json

.ask/Makefile

@@ -0,0 +1,93 @@
+ASK_VERSION := "0.0.5"
+
+DOCKER_SWARM_STACK_NAME := $(shell cat .ask/NAME)
+
+MAKEFILE_PATH := ".ask/Makefile"
+
+
+.PHONY: help
+# Show help
+help:
+	@cat $(MAKEFILE_LIST) | docker run --rm -i xanders/make-help
+
+.PHONY: reload-makefile
+# Reload Makefile from latest Ask version
+reload-makefile:
+	curl -o $(MAKEFILE_PATH) https://raw.githubusercontent.com/ask-ell/ask/refs/heads/release/types/node/Makefile
+
+.PHONY: requirements-get
+# Get requirements
+requirements-get:
+	@echo "Requirements"
+	@echo "Make : https://www.gnu.org/software/make/manual/make.html"
+	@echo "Node : https://nodejs.org/"
+	@echo "NPM : https://www.npmjs.com/"
+	@echo "Docker : https://docker.com/"
+
+.ask/secrets.json:
+	cp -r .ask/secrets.sample.json .ask/secrets.json
+
+
+compose := docker compose --file .ask/compose.yml
+run := $(compose) run --rm front-end
+packageManager := $(run) npm
+packageManagerRun := $(packageManager) run
+
+.PHONY: install
+# Install dependencies
+install:
+	$(packageManager) install
+	date > node_modules/last_install
+
+node_modules/last_install:
+	@make -f $(MAKEFILE_PATH) install
+
+.PHONY: build
+# Build project
+build: node_modules/last_install
+	$(packageManagerRun) build
+	mkdir -p .ask/build
+	date > .ask/build/last_build
+
+.ask/build/last_build:
+	@make -f $(MAKEFILE_PATH) build
+
+.PHONY: serve
+# Run services in development mode
+serve: .ask/secrets.json node_modules/last_install
+	$(compose) up -d
+
+.PHONY: format
+# Format project
+format:
+	$(packageManagerRun) format
+
+.PHONY: lint
+# Format project
+lint:
+	$(packageManagerRun) lint
+
+.PHONY: test
+# Run tests
+test: node_modules/last_install
+	$(packageManagerRun) test
+
+.PHONY: test-watch
+# Run tests in watch mode
+test-watch: node_modules/last_install
+	$(packageManagerRun) test:watch
+
+.PHONY: clean
+# Stop and clean services
+clean:
+	$(compose) down --volumes
+
+.PHONY: deploy
+# Deploy services in Docker Swarm
+deploy: .ask/secrets.json
+	docker stack deploy -c .ask/swarm.yml --with-registry-auth --resolve-image always $(DOCKER_SWARM_STACK_NAME)
+
+.PHONY: undeploy
+# Undeploy services in Docker Swarm
+undeploy: .ask/secrets.json
+	docker stack rm $(DOCKER_SWARM_STACK_NAME)

.ask/NAME

@@ -0,0 +1 @@
+ask-ell_innovation_website

.ask/compose.yml

@@ -0,0 +1,32 @@
+# TODO: https://ask-ell.atlassian.net/browse/ASK-3
+
+networks:
+  default:
+    driver: "bridge"
+
+secrets:
+  ask:
+    file: secrets.json
+
+volumes:
+  source:
+    driver: local
+    driver_opts:
+      type: none
+      o: bind
+      device: $PWD
+
+services:
+  front-end:
+    image: node:20.19.2
+    networks:
+    - default
+    user: node
+    working_dir: /home/node/workspace
+    volumes:
+    - source:/home/node/workspace
+    ports:
+    - "4321:4321"
+    secrets:
+    - ask
+    command: npm run start:dev -- --host

.ask/config/front-end/Dockerfile

@@ -0,0 +1,9 @@
+FROM nginx:alpine3.21
+
+WORKDIR /usr/share/nginx/html
+
+COPY ./dist .
+
+COPY .ask/config/front-end/default.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE 80

.ask/config/front-end/default.conf

@@ -0,0 +1,16 @@
+server {
+    listen      80;
+    listen [::]:80;
+    server_name localhost;
+
+    location / {
+        root    /usr/share/nginx/html;
+        index index.html;
+        try_files $uri /index.html;
+    }
+
+    error_page 500 502 503 504 /50x.html;
+    location = /50x.html {
+        root    /usr/share/nginx/html;
+    }
+}

.ask/secrets.sample.json

@@ -0,0 +1 @@
+{}

.ask/swarm.yml

@@ -0,0 +1,86 @@
+networks:
+  default:
+    driver: "overlay"
+
+secrets:
+  ask:
+    file: secrets.json
+
+services:
+  code-repository-plugin:
+    image: registry.gitlab.com/ask-ell/innovation/factory/code-repository-plugin:develop
+    networks:
+    - default
+    ports:
+    - "40001:10000"
+    secrets:
+    - ask
+
+  general-plugin:
+    image: registry.gitlab.com/ask-ell/innovation/factory/general-plugin:develop
+    networks:
+    - default
+    ports:
+    - "40003:3000"
+    secrets:
+    - ask
+
+  hosting-plugin:
+    image: registry.gitlab.com/ask-ell/innovation/factory/hosting-plugin:develop
+    networks:
+    - default
+    ports:
+    - "40004:4000"
+    secrets:
+    - ask
+    user: root
+    volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+
+  plugins-manager:
+    image: registry.gitlab.com/ask-ell/innovation/factory/plugins-manager:develop
+    networks:
+    - default
+    ports:
+    - "40008:8000"
+    secrets:
+    - ask
+
+  proxy-plugin:
+    image: registry.gitlab.com/ask-ell/innovation/factory/proxy-plugin:develop
+    networks:
+    - default
+    ports:
+    - "40005:5000"
+    secrets:
+    - ask
+
+  proxy:
+    image: registry.gitlab.com/ask-ell/innovation/factory/proxy:develop
+    networks:
+    - default
+    ports:
+      - target: 8080
+        published: 80
+        protocol: tcp
+        mode: host
+    secrets:
+    - ask
+
+  pwa:
+    image: registry.gitlab.com/ask-ell/innovation/factory/pwa:develop
+    networks:
+    - default
+    ports:
+    - "40006:80"
+    secrets:
+    - ask
+
+  security-plugin:
+    image: registry.gitlab.com/ask-ell/innovation/factory/security-plugin:develop
+    networks:
+    - default
+    ports:
+    - 40007:7000
+    secrets:
+    - ask

package.json

@@ -4,6 +4,10 @@
     "start:dev": "astro dev",
     "build": "astro build"
   },
+  "engines": {
+    "node": "20.19.2",
+    "npm": "10.8.2"
+  },
   "devDependencies": {
     "astro": "^5.17.1",
     "sass": "^1.97.3"

src/components/banner.astro

@@ -5,6 +5,5 @@ const { title } = Astro.props;
 <div class="app-banner">
     <div class="app-container">
         <h1>{title}</h1>
-        <slot name="banner-content" />
     </div>
 </div>

src/components/footer.astro

@@ -8,19 +8,21 @@ import Links from "./links.astro";
   </div>
 </footer>
 
-<script src="https://kit.fontawesome.com/30e32532db.js" crossorigin="anonymous"
-></script>
+<script src="https://kit.fontawesome.com/30e32532db.js" crossorigin="anonymous"></script>
+
 <script
   data-collect-dnt="true"
   async
-  src="https://tylerdurden.ask-ell.com/latest.js"></script>
-<noscript
-  ><img
+  src="https://tylerdurden.ask-ell.com/latest.js">
+</script>
+
+<noscript>
+  <img
     src="https://tylerdurden.ask-ell.com/noscript.gif?collect-dnt=true"
     alt=""
     referrerpolicy="no-referrer-when-downgrade"
-  /></noscript
->
+  />
+</noscript>
 
 <style>
   footer {

src/components/logo.astro

@@ -7,7 +7,7 @@ import { Image } from "astro:assets";
     alt="Ask'ell logo"
     loading="eager"
     src={{
-        src: "/images/ask-ell-logo.png",
+        src: "/images/ask-ell-logo-medium-size.jpg",
         format: "png",
         height: 604,
         width: 604,

src/components/navigation.astro

@@ -11,16 +11,16 @@ import Logo from "./logo.astro";
     </div>
     <ul class="app-navbar__links">
         <li>
-            <a class="app-navbar__link" href="/services">Services</a>
+            <a class="app-navbar__link" href="/about">About</a>
         </li>
         <li>
-            <a class="app-navbar__link" href="/projects">Projects</a>
+            <a class="app-navbar__link" href="/services">Services</a>
         </li>
         <li>
-            <a class="app-navbar__link" href="/talks">Talks</a>
+            <a class="app-navbar__link" href="/products">Products</a>
         </li>
         <li>
-            <a class="app-navbar__link" href="/about">About</a>
+            <a class="app-navbar__link" href="/talks">Talks</a>
         </li>
         <li>
             <a class="app-navbar__link app-button" href="/contact">Contact</a>

src/layouts/base.layout.astro

@@ -14,7 +14,7 @@ const { title } = Astro.props;
     <meta name="viewport" content="width=device-width" />
     <link
       rel="shortcut icon"
-      href="/images/ask-ell-logo.png"
+      href="/images/ask-ell-logo-icon.jpg"
       type="image/x-icon"
     />
     <meta name="generator" content={Astro.generator} />
@@ -24,11 +24,7 @@ const { title } = Astro.props;
   <body class="default-theme">
     <Header />
     <main>
-      <Banner title={title}>
-        <div slot="banner-content">
-          <slot name="banner-content" />
-        </div>
-      </Banner>
+      <Banner title={title} />
       <slot />
       <div class="app-container contact-form">
         <ContactCard />