initial changes for rehaul

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/dev.iml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/backend/auth/data" isTestSource="false" packagePrefix="Authentication" />
-      <sourceFolder url="file://$MODULE_DIR$/backend/bee/data" isTestSource="false" packagePrefix="Bee" />
-      <sourceFolder url="file://$MODULE_DIR$/backend/file/data" isTestSource="false" packagePrefix="File" />
-      <sourceFolder url="file://$MODULE_DIR$/backend/homepage/data" isTestSource="false" packagePrefix="Homepage" />
-      <sourceFolder url="file://$MODULE_DIR$/backend/mytube/data" isTestSource="false" packagePrefix="MyTube" />
-      <sourceFolder url="file://$MODULE_DIR$/backend/notification/data" isTestSource="false" packagePrefix="Notification" />
-      <sourceFolder url="file://$MODULE_DIR$/systems/backend/mytube/data" isTestSource="false" packagePrefix="MyTube" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/dev.iml" filepath="$PROJECT_DIR$/.idea/dev.iml" />
-    </modules>
-  </component>
-</project>

.idea/php.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MessDetectorOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCSFixerOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCodeSnifferOptionsConfiguration">
-    <option name="highlightLevel" value="WARNING" />
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.2">
-    <option name="suggestChangeDefaultLanguageLevel" value="false" />
-  </component>
-  <component name="PhpStanOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PsalmOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-</project>

.idea/vcs.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/systems/backend/mytube" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/systems/frontend/mytube" vcs="Git" />
-  </component>
-</project>

bin/denv

@@ -1,12 +1,16 @@
 #!/bin/bash
 
-ENVIRONMENT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/../../
+ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/../../" &> /dev/null && pwd )
 
 denv() {
   if [ ! -z $1 ]
   then
-  	$ENVIRONMENT_DIR/$1
+    if [[ "$1" == "setup" ]]; then
+      echo "SETUP IS ONLY ALLOWED ONCE AFTER CLOING THE ENVIRONMENT!!!"
+      exit 1
+    fi
+  	$ENV_DIR/$1
   else
-  	cd $ENVIRONMENT_DIR
+  	cd $ENV_DIR
   fi
 }

bin/dexec

@@ -0,0 +1,64 @@
+#!/bin/bash
+
+denvexec() {
+  # Überprüfen, ob die richtige Anzahl Argumente übergeben wurden
+  if [ $# -lt 2 ]; then
+    echo "Verwendung: denvexec <docker command>"
+    return 1
+  fi
+  
+  local DOCKER_COMMAND="$@"
+  local ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd )
+
+  echo "$SYSTEM_DIR"
+  echo "$ENV_DIR"
+  echo "$DOCKER_COMMAND"
+
+  #MAC
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+      docker compose -f "${ENV_DIR}/docker/docker-compose-mac.yml" $COMMAND
+
+  #LINUX
+  elif [[ "$OSTYPE" == "linux-gnu" ]]; then
+      docker compose -f "${ENV_DIR}/docker/docker-compose.yml" $COMMAND
+
+  else
+      echo "Dieses Skript wird auf deinem Gerät nicht unterstützt"
+      exit 1
+  fi
+}
+
+dexec() {
+  # Überprüfen, ob die richtige Anzahl Argumente übergeben wurden
+  if [ $# -lt 2 ]; then
+    echo "Verwendung: dexec <system> <docker command>"
+    return 1
+  fi
+
+  # convert first parameter to system-direcotry, concat the rest
+  # Teile den String in zwei Teile auf, getrennt durch "-"
+  local part1="${$1%-*}"  # before "-" e.g. auth / bee / etc
+  local part2="${$1##*-}" # after "-" e.g. backend / frontend
+  local SYSTEM_DIR="$part2/$part1"
+  shift # removes first argument
+  local DOCKER_COMMAND="$@"
+
+  local ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/../.." &> /dev/null && pwd )
+
+  echo "$SYSTEM_DIR"
+  echo "$ENV_DIR"
+  echo "$DOCKER_COMMAND"
+
+  #MAC
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+      docker compose -f "${ENV_DIR}/systems/{$SYSTEM_DIR}/docker/docker-compose-mac.yml" $COMMAND
+
+  #LINUX
+  elif [[ "$OSTYPE" == "linux-gnu" ]]; then
+      docker compose -f "${ENV_DIR}/systems/{$SYSTEM_DIR}/docker/docker-compose.yml" $COMMAND
+
+  else
+      echo "Dieses Skript wird auf deinem Gerät nicht unterstützt"
+      exit 1
+  fi
+}

bin/drun

@@ -3,7 +3,7 @@
 drun() {
   # Überprüfen, ob die richtige Anzahl Argumente übergeben wurden
   if [ $# -lt 2 ]; then
-    echo "Verwendung: drun <Container-Name> <Befehl>"
+    echo "Verwendung: drun <system> <run in docker container>"
     return 1
   fi
 
@@ -26,3 +26,25 @@ drun() {
   # Befehl im Container ausführen
   docker exec -it "$CONTAINER_ID" $COMMAND
 }
+
+_drun_completion() {
+    local cur prev opts
+    COMPREPLY=() # Array, das die Vorschläge enthalten wird
+    cur="${COMP_WORDS[COMP_CWORD]}" # Das aktuelle Wort, das vervollständigt werden soll
+    prev="${COMP_WORDS[COMP_CWORD-1]}" # Das vorherige Wort
+
+    # Hier definierst du die Optionen oder Argumente, die `drun` akzeptiert
+    opts="start stop restart status"
+
+    # Wenn die Optionen abhängig vom vorherigen Wort sind, kannst du hier Bedingungen hinzufügen
+    # Beispiel:
+    # if [[ ${prev} == "start" ]]; then
+    #     opts="service1 service2 service3"
+    # fi
+
+    # Die verfügbaren Optionen auf das aktuelle Eingabewort filtern
+    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+    return 0
+}
+
+complete -F _drun_completion drun

bin/script/exec

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-COMMAND="$@"
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-echo "Execute ${COMMAND} in denv"
-
-#MAC
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    docker compose -f "${SCRIPT_DIR}/../../docker/docker-compose-mac.yml" $COMMAND
-
-#LINUX
-elif [[ "$OSTYPE" == "linux-gnu" ]]; then
-    docker compose -f "${SCRIPT_DIR}/../../docker/docker-compose.yml" $COMMAND
-
-else
-    echo "Dieses Skript wird auf deinem Gerät nicht unterstützt"
-    exit 1
-fi

bin/script/foreachSystem

@@ -1,20 +1,21 @@
 #!/bin/bash
+source ../dexec
 
-EXEC_DIR=$(pwd)
+# Überprüfen, ob die richtige Anzahl Argumente übergeben wurden
-FILE_TO_EXECUTE=$1
+if [ $# -lt 1 ]; then
-
+	echo "Verwendung: foreachSystem up -d"
-if [ ! -z $1 ]
+	return 1
-then
-	echo "Execute " $1 " in each system"
-else
-	echo "Execute foreachSystem failed, because no parameter was provided"
-	exit
 fi
 
+local COMMAND="$@"
+local ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/../.." &> /dev/null && pwd )
 
-for SYSTEM in systems/*/*/ ; do
+for SYSTEM in $ENV_DIR/systems/*/*/ ; do
-	echo "executing ${FILE_TO_EXECUTE} in ${SYSTEM}"
+	local part1="${$1%/*}"  # before "/" eg. backend / frontend
-	cd $SYSTEM
+	local part2="${$1##*/}" # after "/" eg. bee / auth / etc
-	./bin/script/$FILE_TO_EXECUTE
+	local SYSTEM_CODE="$part2-$part1"
-	cd $EXEC_DIR
+	local DENV_COMMAND="dexec"
+
+	echo "$DENV_COMMAND $SYSTEM_CODE $COMMAND"
+	$DENV_COMMAND $SYSTEM_CODE $COMMAND
 done

bin/script/prune

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-docker stop $(docker ps -aq)
-
-docker system prune -f
-
-docker network create homepage
-
-./pull
-./bin/script/init

bin/script/pull

@@ -4,11 +4,7 @@ EXEC_DIR=$(pwd)
 
 echo "Execute git pull in each system"
 
-#echo "denv"
-#git pull
-
 for SYSTEM in $EXEC_DIR/systems/*/*/ ; do
-        echo $SYSTEM
         cd $SYSTEM
 	git pull
 	cd $EXEC_DIR

bin/script/setup

@@ -1,54 +0,0 @@
-#!/bin/bash
-
-echo $OSTYPE
-
-#MAC
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    home="$HOME"
-
-#LINUX
-elif [[ "$OSTYPE" == "linux-gnu" ]]; then
-    home="$HOME"
-else
-    echo "Dieses Skript wird nicht unter macOS oder Linux unterstützt."
-    exit 1
-fi
-
-script_path=$(pwd)
-environment=$(basename $script_path)
-
-echo "source ~/$environment/bin/script/denv" >> ~/.profile
-echo "source ~/$environment/bin/script/drun" >> ~/.profile
-echo "source ~/$environment/bin/script/git" >> ~/.profile
-
-echo Running in $script_path
-echo environment = $environment
-
-# $1 = frontend/backend
-# $2 = repo name
-fetch_repository() {
-	if [ ! -d "$1" ];
-	then
-		echo "Create $1"
-		mkdir -p "$1"
-	fi
-
-	cd $1
-
-	if [ ! -d "$2" ];
-	then
-		gh repo clone TheFlawww/$2-$1 $2
-	fi
-
-	cd $script_path
-}
-
-
-#fetch all backends
-fetch_repository backend weedkeeper
-
-#fetch all frontends
-fetch_repository frontend weedkeeper
-
-# initialize
-./bin/script/init

bin/script/upgrade

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-$SCRIPT_DIR/pull
-source $SCRIPT_DIR/../source
-
-drun weedkeeper-backend composer da
-drun weedkeeper-backend composer install
-drun weedkeeper-backend composer dmm
-drun weedkeeper-backend composer console rbac:update
-
-drun weedkeeper-frontend npm i
-drun weedkeeper-frontend npm run build

bin/source

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-source $SCRIPT_DIR/denv
-source $SCRIPT_DIR/drun
-source $SCRIPT_DIR/git

docker/docker-compose-mac.yml

@@ -0,0 +1,27 @@
+networks:
+  weedkeeper:
+    name: weedkeeper
+
+services:
+  traefik:
+    image: traefik:v3.0
+    networks:
+      - weedkeeper
+    command:
+      - "--providers.docker=true"
+      - "--entrypoints.web.address=:80"
+      - "--entrypoints.web.http.redirections.entrypoint.to=websecure"
+      - "--entrypoints.web.http.redirections.entrypoint.scheme=https"
+      - "--entrypoints.websecure.address=:443"
+      - "--certificatesresolvers.le.acme.tlschallenge=true"
+      - "--certificatesresolvers.le.acme.email=florian_feistel@outlook.de"
+      - "--certificatesresolvers.le.acme.storage=/letsencrypt/acme.json"
+    ports:
+      - "80:80"
+      - "443:443"
+      - "8080:8080"
+    volumes:
+      - "./letsencrypt:/letsencrypt"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+    labels:
+      - "traefik.http.routers.traefik.rule=Host(`traefik.weedkeeper.de`)"

docker/install

@@ -0,0 +1,13 @@
+sudo apt-get update
+sudo apt-get install ca-certificates curl gnupg
+sudo install -m 0755 -d /etc/apt/keyrings
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+sudo chmod a+r /etc/apt/keyrings/docker.gpg
+echo \
+  "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+  "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y
+sudo apt install docker-compose -y
+sudo usermod -aG docker $USER

python/capture-thermometer-data.py

@@ -1,37 +0,0 @@
-import asyncio
-import json
-from datetime import datetime
-from bleak import BleakScanner
-
-async def handle_discovery(device, advertisement_data):
-    if device.address == "DB:17:6C:7D:81:F6":
-        keys = list(advertisement_data.manufacturer_data.keys())
-        humKey = keys[len(keys)-1]
-        battery = humKey & 0xFF
-        temperature = (humKey >> 8)/10.0
-        if humKey < 32767: #If Key is bigger than a smallint, temperature is lower than one byte (256)
-            temperature = temperature + 25.6
-
-        data =  {}
-        data['temp'] = temperature
-        data['battery'] = battery / 256.0;
-        data['humid'] = advertisement_data.manufacturer_data[humKey][1]
-        data['timestamp'] = datetime.now().strftime("%d.%m.%Y %H:%M:%S")
-
-        jsonString = json.dumps(data)
-        with open("/home/flo/local-weedkeeper/systems/backend/weedkeeper/var/temperature.data", "a") as dataFile:
-            dataFile.write(jsonString+",\n")
-        #print(jsonString)
-        await scanner.stop()
-
-async def scan():
-    global scanner
-    scanner = BleakScanner(handle_discovery)
-    await scanner.start()
-    await asyncio.sleep(10)
-    await scanner.stop()
-
-async def main():
-    await scan()
-
-asyncio.run(main())

setup

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# THIS SCRIPT NEEDS TO BE EXECUTED FIRST AFTER CLONING THE ENVIRONMENT AND SHALL NEVER BE EXECUTED AGAIN
+# IT SETS UP THE ENVIRONMENT IN THE PROFILE TO ENABLE CORE COMMANDS LIKE denv drun dexec
+
+# MAC
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    home="$HOME"
+
+# LINUX
+elif [[ "$OSTYPE" == "linux-gnu" ]]; then
+    home="$HOME"
+
+else
+    echo "Dieses Skript wird auf deinem Gerät nicht unterstützt"
+    exit 1
+fi
+
+ENV_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+echo "Setup dev-env..."
+echo "Adding sourcing of environment commands to .profile"
+echo "" >> ~/.profile
+echo "# denv setup" >> ~/.profile
+echo "source $ENV_DIR/bin/denv" >> ~/.profile
+echo "source $ENV_DIR/bin/drun" >> ~/.profile
+echo "source $ENV_DIR/bin/dexec" >> ~/.profile
+echo "source $ENV_DIR/bin/git" >> ~/.profile
+
+source ~/.profile

up

@@ -1,4 +1,8 @@
 #!/bin/bash
 
-./bin/script/exec up -d
+source bin/denv
-./bin/script/foreachSystem up
+source bin/dexec
+source bin/drun
+
+denvexec up -d
+./bin/script/foreachSystem up -d