Merge pull request #2 from JustusPlays78/develop

made morde oversight
2025-04-29 19:24:24 +00:00 · 2024-12-25 06:23:03 +01:00 · 2024-12-25 06:22:24 +01:00 · 2024-12-25 06:14:28 +01:00 · 2024-12-25 06:13:01 +01:00 · 2023-03-05 16:13:16 +01:00
37 changed files with 7553 additions and 13356 deletions
--- a/updater/.gitignore
+++ b/updater/.gitignore
@ -2,6 +2,8 @@
 systemfile.json
 settings.json
 ./idea
 .idea/
 # Logs
 logs
 *.log
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,32 +0,0 @@
 version: 2.1
 jobs:
  build:
    working_directory: ~/repo
    docker:
      - image: circleci/node:11
    steps:
      - checkout
      - run:
          name: Update NPM
          command: "sudo npm install -g npm"
      - restore_cache:
          key: dependency-cache-{{ checksum "package.json" }}
      - run:
          name: Install Dependencies
          command: npm install
      - run:
          name: Install dpkg and fakeroot
          command: |
            sudo apt-get update -y
            sudo apt-get install -y dpkg fakeroot
      - save_cache:
          key: dependency-cache-{{ checksum "package.json" }}
          paths:
            - ./node_modules
      - run:
          name: Generate Builds
          command: npm run make
      - store_artifacts:
          path: ~/repo/out/make
--- a/updater/data-out.yaml
+++ b/updater/data-out.yaml
--- a/git-commit.sh
+++ b/git-commit.sh
@ -1,9 +0,0 @@
 #!/bin/bash
 # $1 = Changes
 # $2 = Branch
 git add .
 git commit -m "$1"
 git push -uf origin paul-bastelt
 #git push -uf paulgit paul-bastelt
--- a/package-lock.json
+++ b/package-lock.json
--- a/updater/package.json
+++ b/updater/package.json
@ -20,7 +20,8 @@
    "config": {
        "forge": {
            "packagerConfig": {},
-            "makers": [{
+            "makers": [
                {
                    "name": "@electron-forge/maker-squirrel",
                    "config": {
                        "name": "updater"
@ -61,6 +62,6 @@
        "@electron-forge/maker-rpm": "^6.0.0-beta.66",
        "@electron-forge/maker-squirrel": "^6.0.0-beta.66",
        "@electron-forge/maker-zip": "^6.0.0-beta.66",
-        "electron": "^21.0.1"
+        "electron": "^33.2.1"
    }
 }
--- a/updater/programInternal.yaml
+++ b/updater/programInternal.yaml
--- a/release-test-lustigeDateiv1.zip
+++ b/release-test-lustigeDateiv1.zip
--- a/release-test-lustigeDateiv2.zip
+++ b/release-test-lustigeDateiv2.zip
--- a/updater/sectorfileUpdater.yaml
+++ b/updater/sectorfileUpdater.yaml
--- a/updater/src/append_to_file.js
+++ b/updater/src/append_to_file.js
--- a/updater/src/css/boot.css
+++ b/updater/src/css/boot.css
--- a/updater/src/data_structure.js
+++ b/updater/src/data_structure.js
--- a/updater/src/download.js
+++ b/updater/src/download.js
--- a/updater/src/footer.html
+++ b/updater/src/footer.html
--- a/updater/src/getFiles.js
+++ b/updater/src/getFiles.js
--- a/updater/src/git_ops.js
+++ b/updater/src/git_ops.js
--- a/updater/src/header.html
+++ b/updater/src/header.html
--- a/updater/src/html_elements.js
+++ b/updater/src/html_elements.js
--- a/updater/src/index.css
+++ b/updater/src/index.css
--- a/updater/src/index.html
+++ b/updater/src/index.html
@ -16,6 +16,12 @@
        </h1>
    </div>
 </head>
 <script>
    $(function () {
    $("#header").load("./header.html");
    $("#footer").load("./footer.html");
    });
 </script>
 <body class="ecsu-bg-dark-out text-white">
@ -117,7 +123,7 @@
                                    <label class="form-control-label text-white" for="input-username">Hoppie
                                        Code</label>
                                    <input class="form-check-input ms-auto" type="checkbox" id="savepwhoppie">
-                                    <input type="text" id="passwordhoppie" class="form-control" placeholder="Hoppie Code">
+                                    <input type="password" id="passwordhoppie" class="form-control" placeholder="Hoppie Code">
                                </div>
                            </div>
                        </div>
@ -147,8 +153,8 @@
            </div>-->
                    <br>
                    <button id="savecred">Save your Credentials</button>
            </form>
                </div>
            </form>
            <form>
                If you want Eurosounds, please check the box below and click the download button. <br>
--- a/updater/src/index.js
+++ b/updater/src/index.js
--- a/src/index1.html
+++ b/src/index1.html
@ -0,0 +1,41 @@
 <script src="https://code.jquery.com/jquery-3.3.1.js" integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60="
  crossorigin="anonymous">
  </script>
 <script src=".\js\loople.js"></script>
 <script>
  $(function () {
    $("#header").load("header.html");
    $("#footer").load("footer.html");
  });
 </script>
 <body class="bg-dark">
  <div class="main-content" id="panel">
    <!--Header-->
    <div id="header"></div>
    <!--CONTENT-->
    <!--Footer-->
    <div id="footer"></div>
  </div>
  <script src="https://demos.creative-tim.com/soft-ui-dashboard/assets/js/core/popper.min.js"></script>
  <script src="https://demos.creative-tim.com/soft-ui-dashboard/assets/js/core/bootstrap.min.js"></script>
  <script src="https://demos.creative-tim.com/soft-ui-dashboard/assets/js/plugins/chartjs.min.js"></script>
  <script src="https://demos.creative-tim.com/soft-ui-dashboard/assets/js/plugins/Chart.extension.js"></script>
  <script src="https://demos.creative-tim.com/soft-ui-dashboard/assets/js/soft-ui-dashboard.min.js?v=1.0.2"></script>
  <script src="./js/loopple.js"></script>
  <script>
    $(function () {
      $("#header").load(".\html\header.html");
      $("#footer").load(".\html\footer.html");
    });
    function kackc(){
      var dragonHealth = document.getElementById("progressb").value;
      dragonHealth.value = 25;
    }
  </script>
 </body>
--- a/updater/src/js/loople.js
+++ b/updater/src/js/loople.js
--- a/updater/src/preload.js
+++ b/updater/src/preload.js
--- a/updater/src/renderer.js
+++ b/updater/src/renderer.js
--- a/updater/src/save.js
+++ b/updater/src/save.js
--- a/updater/src/settings.html
+++ b/updater/src/settings.html
--- a/updater/src/startup.js
+++ b/updater/src/startup.js
@ -50,11 +50,11 @@ function updateUI() {
        checkBoxUsername.checked = true;
    }
    if (structure.password.save) {
-        //passwordInput.value = structure.password.pass;
+        passwordInput.value = structure.password.pass;
        checkBoxPassword.checked = true;
    }
    if (structure.passwordhoppie.save) {
-        //passwordhoppieInput.value = structure.passwordhoppie.pass;
+        passwordhoppieInput.value = structure.passwordhoppie.pass;
        checkBoxSavepwhoppie.checked = true;
    }
    dirBox.value = systemstructure.path;
--- a/updater/src/syncing.html
+++ b/updater/src/syncing.html
--- a/updater/.gitlab/actions/release/action.yml
+++ b/updater/.gitlab/actions/release/action.yml
@ -1,61 +0,0 @@
 name: Electron Builder Action
 author: Samuel Meuli
 description: GitHub Action for building and releasing Electron apps
 inputs:
  github_token:
    description: GitHub authentication token
    required: true
  mac_certs:
    description: Base64-encoded code signing certificate for macOS
    required: false
  mac_certs_password:
    description: Password for decrypting `mac_certs`
    required: false
  release:
    description: Whether the app should be released after a successful build
    required: false
    default: false
  windows_certs:
    description: Base64-encoded code signing certificate for Windows
    required: false
  windows_certs_password:
    description: Password for decrypting `windows_certs`
    required: false
  package_root:
    description: Directory where NPM/Yarn commands should be run
    required: false
    default: "."
  build_script_name:
    description: Name of the optional NPM build script which is executed before `electron-builder`
    required: false
    default: build
  skip_build:
    description: Whether the action should execute the NPM build script before running `electron-builder`
    required: false
    default: false
  use_vue_cli:
    description: Whether to run `electron-builder` using the Vue CLI plugin instead of calling the command directly
    required: false
    default: false
  args:
    description: Other arguments to pass to the `electron-builder` command, e.g. configuration overrides
    required: false
    default: ""
  max_attempts:
    description: Maximum number of attempts for completing the build and release step
    required: false
    default: "1"
  # Deprecated
  app_root:
    description: Directory where `electron-builder` commands should be run
    required: false
 runs:
  using: node12
  main: index.js
 branding:
  icon: upload-cloud
  color: blue
--- a/updater/.gitlab/actions/release/index.js
+++ b/updater/.gitlab/actions/release/index.js
@ -1,156 +0,0 @@
 const { execSync } = require("child_process");
 const { existsSync, readFileSync } = require("fs");
 const { join } = require("path");
 /**
 * Logs to the console
 */
 const log = (msg) => console.log(`\n${msg}`); // eslint-disable-line no-console
 /**
 * Exits the current process with an error code and message
 */
 const exit = (msg) => {
    console.error(msg);
    process.exit(1);
 };
 /**
 * Executes the provided shell command and redirects stdout/stderr to the console
 */
 const run = (cmd, cwd) => execSync(cmd, { encoding: "utf8", stdio: "inherit", cwd });
 /**
 * Determines the current operating system (one of ["mac", "windows", "linux"])
 */
 const getPlatform = () => {
    switch (process.platform) {
        case "darwin":
            return "mac";
        case "win32":
            return "windows";
        default:
            return "linux";
    }
 };
 /**
 * Returns the value for an environment variable (or `null` if it's not defined)
 */
 const getEnv = (name) => process.env[name.toUpperCase()] || null;
 /**
 * Sets the specified env variable if the value isn't empty
 */
 const setEnv = (name, value) => {
    if (value) {
        process.env[name.toUpperCase()] = value.toString();
    }
 };
 /**
 * Returns the value for an input variable (or `null` if it's not defined). If the variable is
 * required and doesn't have a value, abort the action
 */
 const getInput = (name, required) => {
    const value = getEnv(`INPUT_${name}`);
    if (required && !value) {
        exit(`"${name}" input variable is not defined`);
    }
    return value;
 };
 /**
 * Installs NPM dependencies and builds/releases the Electron app
 */
 const runAction = () => {
    const platform = getPlatform();
    const release = getInput("release", true) === "true";
    const pkgRoot = getInput("package_root", true);
    const buildScriptName = getInput("build_script_name", true);
    const skipBuild = getInput("skip_build") === "true";
    const useVueCli = getInput("use_vue_cli") === "true";
    const args = getInput("args") || "";
    const maxAttempts = Number(getInput("max_attempts") || "1");
    // TODO: Deprecated option, remove in v2.0. `electron-builder` always requires a `package.json` in
    // the same directory as the Electron app, so the `package_root` option should be used instead
    const appRoot = getInput("app_root") || pkgRoot;
    const pkgJsonPath = join(pkgRoot, "package.json");
    const pkgLockPath = join(pkgRoot, "package-lock.json");
    // Determine whether NPM should be used to run commands (instead of Yarn, which is the default)
    const useNpm = existsSync(pkgLockPath);
    log(`Will run ${useNpm ? "NPM" : "Yarn"} commands in directory "${pkgRoot}"`);
    // Make sure `package.json` file exists
    if (!existsSync(pkgJsonPath)) {
        exit(`\`package.json\` file not found at path "${pkgJsonPath}"`);
    }
    // Copy "github_token" input variable to "GH_TOKEN" env variable (required by `electron-builder`)
    setEnv("GH_TOKEN", getInput("github_token", true));
    // Require code signing certificate and password if building for macOS. Export them to environment
    // variables (required by `electron-builder`)
    if (platform === "mac") {
        const mac_certs = getInput("mac_certs");
        const mac_certs_password = getInput("mac_certs_password");
        if (mac_certs && mac_certs_password) {
            setEnv("CSC_LINK", mac_certs);
            setEnv("CSC_KEY_PASSWORD", mac_certs_password);
        } else {
            setEnv("CSC_IDENTITY_AUTO_DISCOVERY", "false");
        }
    } else if (platform === "windows") {
        setEnv("CSC_LINK", getInput("windows_certs"));
        setEnv("CSC_KEY_PASSWORD", getInput("windows_certs_password"));
    }
    // Disable console advertisements during install phase
    setEnv("ADBLOCK", true);
    // log(`Installing dependencies using ${useNpm ? "NPM" : "Yarn"}…`);
    // run(useNpm ? "npm install" : "yarn", pkgRoot);
    // Run NPM build script if it exists
    if (skipBuild) {
        log("Skipping build script because `skip_build` option is set");
    } else {
        log("Running the build script…");
        if (useNpm) {
            run(`npm run ${buildScriptName} --if-present`, pkgRoot);
        } else {
            // TODO: Use `yarn run ${buildScriptName} --if-present` once supported
            // https://github.com/yarnpkg/yarn/issues/6894
            const pkgJson = JSON.parse(readFileSync(pkgJsonPath, "utf8"));
            if (pkgJson.scripts && pkgJson.scripts[buildScriptName]) {
                run(`yarn run ${buildScriptName}`, pkgRoot);
            }
        }
    }
    log(`Building${release ? " and releasing" : ""} the Electron app…`);
    const cmd = useVueCli ? "vue-cli-service electron:build" : `electron-builder`;
    for (let i = 0; i < maxAttempts; i += 1) {
        try {
            run(
                `${useNpm ? "npx --no-install" : "yarn run"} ${cmd} --${platform} ${
 					release ? "--publish always" : ""
 				} ${args}`,
                appRoot,
            );
            break;
        } catch (err) {
            if (i < maxAttempts - 1) {
                log(`Attempt ${i + 1} failed:`);
                log(err);
            } else {
                throw err;
            }
        }
    }
 };
 runAction();
--- a/updater/.gitlab/workflows/build.yml
+++ b/updater/.gitlab/workflows/build.yml
@ -1,38 +0,0 @@
 name: Build/release
 on: push
 jobs:
  release:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
        os: [macos-latest, ubuntu-latest, windows-latest]
    steps:
      - name: Check out Git repository
        uses: actions/checkout@v1
      - name: Install Node.js, NPM and Yarn
        uses: actions/setup-node@v1
        with:
          node-version: 14
      - name: Installing dependencies
        run: yarn
      - name: Tsc
        run: npx tsc
      - name: Build/release Electron app
        uses: ./.github/actions/release
        with:
          skip_build: false
          # GitHub token, automatically provided to the action
          # (No need to define this secret in the repo settings)
          github_token: ${{ secrets.DEPLOY_TOKEN }}
          # If the commit is tagged with a version (e.g. "v1.0.0"),
          # release the app after building
          release: ${{ startsWith(github.ref, 'refs/tags/v') }}
--- a/updater/package-lock.json
+++ b/updater/package-lock.json
--- a/updater/src/index1.html
+++ b/updater/src/index1.html
@ -1,91 +0,0 @@
 <script src="https://code.jquery.com/jquery-3.3.1.js" integrity="sha256-2Kok7MbOyxpgUVvAk/HJ2jigOSYS2auK4Pfzbm7uH60="
  crossorigin="anonymous">
  </script>
 <script src=".\js\loople.js"></script>
 <script>
  $(function () {
    $("#header").load("header.html");
    $("#footer").load("footer.html");
  });
 </script>
 <body class="bg-dark">
  <div class="main-content" id="panel">
    <!--Header-->
    <div id="header"></div>
    <!--CONTENT-->
    <div class="card mb-4 ecsu-bg-dark-light-out">
      <div class="card-body">
        <form>
          <div class="row">
            <div class="col-8 ">
              <h6 class="mb-0 text-white">Home</h6>
            </div>
            <div class="col-4"><button class="btn btn-sm ecsu-btn-dark" id="download">Sync</button></div>
          </div>
          <div class="col-lg-6">
            <div class="form-group">
              <label class="form-control-label text-white" for="input-last-name">Select Sectorfilefolder</label>
              <input type="file" id="sctfolder" class="form-control" webkitdirectory directory />
            </div>
          </div>
          <div>
            <h6 class="text-white">Sectorfile AIRAC: 2209</h6>
          </div>
          <div>
            <h6 class="text-uppercase text-xs font-weight-bolder text-white">Logins</h6>
            <div class="progress-wrapper mb-4">
              <div class="progress-info">
                <div class="progress-percentage">
                  <span class="text-sm font-weight-bold">60%</span>
                </div>
              </div>
              <div class="progress">
                <div class="progress-bar  escu-bg-gradient-primary " role="progressbar" aria-valuenow="60"
                  aria-valuemin="0" aria-valuemax="100" style="width: 60%;" id="progessb" id="dirBox"></div>
              </div>
            </div><button class="btn ecsu-btn-dark mb-4">Button</button>
        </form>
      </div>
    </div>
    <!--CONTENT PRIMARY DROPDOWN BUTTON
      <div class="container-fluid pt-3 ">
        <div class="col-12 col-xl-4 mb-4">
          <div class="dropdown mb-4">
            <button class="btn bg-gradient-primary dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-expanded="false">
                          Primary
                      </button>
                <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                  <li><a class="dropdown-item" href="#">Action</a></li>
                  <li><a class="dropdown-item" href="#">Another action</a></li>
                  <li><a class="dropdown-item" href="#">Something else here</a></li>
                </ul>
            </div>   
        </div>
 -->
    <!--Footer-->
    <div id="footer"></div>
  </div>
  <script src="https://demos.creative-tim.com/soft-ui-dashboard/assets/js/core/popper.min.js"></script>
  <script src="https://demos.creative-tim.com/soft-ui-dashboard/assets/js/core/bootstrap.min.js"></script>
  <script src="https://demos.creative-tim.com/soft-ui-dashboard/assets/js/plugins/chartjs.min.js"></script>
  <script src="https://demos.creative-tim.com/soft-ui-dashboard/assets/js/plugins/Chart.extension.js"></script>
  <script src="https://demos.creative-tim.com/soft-ui-dashboard/assets/js/soft-ui-dashboard.min.js?v=1.0.2"></script>
  <script src="./js/loopple.js"></script>
  <script>
    $(function () {
      $("#header").load(".\html\header.html");
      $("#footer").load(".\html\footer.html");
    });
    function kackc(){
      var dragonHealth = document.getElementById("progressb").value;
      dragonHealth.value = 25;
    }
  </script>
 </body>
--- a/updater/systemfile.json
+++ b/updater/systemfile.json
@ -1,3 +0,0 @@
 {
    "path": "F:\\02 Benutzer\\Chef\\Downloads\\Donwload tets"
 }
--- a/updater/yarn.lock
+++ b/updater/yarn.lock
Author	SHA1	Message	Date
Julscha	d62df1fb45	Merge pull request #2 from JustusPlays78/develop made morde oversight	2024-12-25 06:23:03 +01:00
Julscha	b077971cac	made morde oversight	2024-12-25 06:22:24 +01:00
Julscha	48666acfac	Merge pull request #1 from JustusPlays78/develop Develop	2024-12-25 06:14:28 +01:00
Julscha	b8ce352126	first small changes	2024-12-25 06:13:01 +01:00
Fionn	8eb0b99959	set hoppie field to password type	2023-03-05 16:13:16 +01:00
Julian	3df452d17e	Update startup.js	2023-03-05 16:11:17 +01:00
Julian Schallenkammer	5206a73673	Merge pull request 'Update 'updater/src/startup.js'' (#10 ) from julscha-patch-1 into main Reviewed-on: Julscha/SectorfileUpdater#10	2023-03-05 15:00:53 +00:00
Julian Schallenkammer	53eaabd402	Update 'updater/src/startup.js'	2023-03-05 15:00:44 +00:00