From 11dad79794fec0d499848fb1870270dacfa21f14 Mon Sep 17 00:00:00 2001 From: jamesread Date: Thu, 24 Aug 2023 12:17:55 +0100 Subject: [PATCH] fmt: Added pre-commit, fixed a few lint errors, npn updated webui --- .github/ISSUE_TEMPLATE/support_request.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 8 ++--- .goreleaser.yml | 15 ++++---- .pre-commit-config.yaml | 10 ++++++ CONTRIBUTING.adoc | 22 ++++++------ Dockerfile | 6 ++-- Dockerfile.arm64 | 8 ++--- Dockerfile.armv7 | 10 +++--- Jenkinsfile | 8 ++--- Makefile | 14 ++++---- README.md | 29 ++++++++------- SECURITY.md | 4 +-- buf.gen.yaml | 1 - buf.yaml | 2 +- config.yaml | 19 +++++----- integration-tests/Makefile | 2 +- integration-tests/README.md | 2 +- integration-tests/Vagrantfile | 2 +- integration-tests/configs/config.general.yaml | 11 +++--- .../configs/config.hiddenFooter.yaml | 6 ++-- .../configs/config.hiddenNav.yaml | 8 ++--- .../general/defaultHomepageRender.spec.js | 2 -- .../hiddenFooter/hiddenFooter.spec.js | 2 -- .../integration/hiddenNav/hiddenNav.spec.js | 2 -- integration-tests/cypress/support/commands.js | 1 - integration-tests/cypressRun.sh | 1 - var/initscript/OliveTin | 2 +- var/openrc/OliveTin | 2 +- webui/index.html | 14 ++++---- webui/package-lock.json | 36 +++++++++---------- 30 files changed, 124 insertions(+), 127 deletions(-) create mode 100644 .pre-commit-config.yaml diff --git a/.github/ISSUE_TEMPLATE/support_request.md b/.github/ISSUE_TEMPLATE/support_request.md index b0e48d5..02a6299 100644 --- a/.github/ISSUE_TEMPLATE/support_request.md +++ b/.github/ISSUE_TEMPLATE/support_request.md @@ -39,7 +39,7 @@ If possible, please copy and paste your OliveTin logs from when the error happen **Screenshot of WebDeveloper console logs** If you know how, and if you think it's relevant, a screenshot of the -WebDeveloper console from when you clicked a button is often really helpful. +WebDeveloper console from when you clicked a button is often really helpful. **Anything else?** diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d7ba602..4d87839 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,7 +4,7 @@ First of all, thank you for considering to raise a pull request! Don’t be afraid to ask for advice before working on a contribution. If you’re thinking about a bigger change, especially that might affect the core working or architecture, it’s almost essential to talk and ask about what you’re planning might affect things. Some of the larger future plans may not be documented well so it’s difficult to understand how your change might affect the general direction and roadmap of this project without asking. -The preferred way to communicate is probably via Discord or GitHub issues. +The preferred way to communicate is probably via Discord or GitHub issues. Helpful information to understand the project can be found here: [CONTRIBUTING](https://github.com/OliveTin/OliveTin/blob/main/CONTRIBUTING.adoc) @@ -13,10 +13,10 @@ Helpful information to understand the project can be found here: [CONTRIBUTING]( # Checklist Please put a X in the boxes as evidence of reading through the checklist. -- [ ] I have forked the project, and raised this PR on a feature branch. +- [ ] I have forked the project, and raised this PR on a feature branch. - [ ] `make githooks` has been run, and my git commit message was accepted by the git hook. - [ ] `make daemon-compile` runs without any issues. - [ ] `make daemon-codestyle` runs without any issues. - [ ] `make daemon-unittests` runs without any issues. -- [ ] `make webui-codestyle` runs without any issues. -- [ ] I understand and accept the [AGPL-3.0 license](LICENSE) and [code of conduct](CODE_OF_CONDUCT.md), and my contributions fall under these. +- [ ] `make webui-codestyle` runs without any issues. +- [ ] I understand and accept the [AGPL-3.0 license](LICENSE) and [code of conduct](CODE_OF_CONDUCT.md), and my contributions fall under these. diff --git a/.goreleaser.yml b/.goreleaser.yml index 4f75283..86e5b9a 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -18,7 +18,7 @@ builds: goarm: - 5 # For old RPIs - - 6 + - 6 - 7 main: cmd/OliveTin/main.go @@ -62,10 +62,10 @@ changelog: - '^refactor:' archives: - - + - format: tar.gz - files: + files: - config.yaml - LICENSE - README.md @@ -225,15 +225,14 @@ release: ## Container images ([on Docker Hub](https://hub.docker.com/r/jamesread/olivetin/tags?page=1&ordering=last_updated)) - `docker pull docker.io/jamesread/olivetin:{{ .Version }}` - + ## Upgrade warnings, or breaking changes - - - No such issues between the last release and this version. + + - No such issues between the last release and this version. ## Useful links - [Which download do I need?](https://docs.olivetin.app/choose-package.html) - [Ask for help and chat with others users in the Discord community](https://discord.gg/jhYWWpNJ3v) - + Thanks for your interest in OliveTin! - diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..fd16ba2 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,10 @@ +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index ebd05e9..5b23b32 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -7,9 +7,9 @@ of multiple projects, your time and interest in contributing is most welcome. If you're not sure where to get started, raise an issue in the project. Ideas may be discussed, purely on their merits and issues. Our Code of Conduct -(CoC) is straightforward - it's important that contributors feel comfortable in -discussion throughout the whole process. This project respects the -link:https://www.kernel.org/doc/html/latest/process/code-of-conduct.html[Linux Kernel code of conduct]. +(CoC) is straightforward - it's important that contributors feel comfortable in +discussion throughout the whole process. This project respects the +link:https://www.kernel.org/doc/html/latest/process/code-of-conduct.html[Linux Kernel code of conduct]. == If you're not sure, ask! @@ -18,19 +18,19 @@ contribution. If you're thinking about a bigger change, especially that might affect the core working or architecture, it's almost essential to talk and ask about what you're planning might affect things. Some of the larger future plans may not be documented well so it's difficult to understand how your change might affect -the general direction and roadmap of this project without asking. +the general direction and roadmap of this project without asking. -The preferred way to communicate is probably via Discord or GitHub issues. +The preferred way to communicate is probably via Discord or GitHub issues. -=== Dev environment setup and clean build - Fedora +=== Dev environment setup and clean build - Fedora ``` -dnf install git go protobuf-compiler make -y +dnf install git go protobuf-compiler make -y git clone https://github.com/OliveTin/OliveTin.git cd OliveTin -# `make grpc` will also run `make go-tools`, which installs "buf". This binary -# will be put in your GOPATH/bin/, which should be on your path. buf is used to +# `make grpc` will also run `make go-tools`, which installs "buf". This binary +# will be put in your GOPATH/bin/, which should be on your path. buf is used to # generate the protobuf / grpc stubs. make grpc make @@ -39,10 +39,10 @@ make === Getting started to contribute; -The project layout is reasonably straightforward; +The project layout is reasonably straightforward; * See the `Makefile` for common targets. This project was originally created on top of Fedora, but it should be usable on Debian/your faveourite distro with minor changes (if any). -* The API is defined in protobuf+grpc - you will need to `make grpc`. +* The API is defined in protobuf+grpc - you will need to `make grpc`. * The Go daemon is built from the `cmd` and `internal` directories mostly. * The webui is just a single page application with a bit of Javascript in the `webui` directory. This can happily be hosted on another webserver. diff --git a/Dockerfile b/Dockerfile index bd931f2..bb13114 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,16 +4,16 @@ LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin LABEL org.opencontainers.image.title=OliveTin RUN mkdir -p /config /var/www/olivetin \ - && microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ + && microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ iputils \ openssh-clients \ shadow-utils \ docker \ && microdnf clean all -RUN useradd --system --create-home olivetin -u 1000 +RUN useradd --system --create-home olivetin -u 1000 -EXPOSE 1337/tcp +EXPOSE 1337/tcp VOLUME /config diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index e3361fe..089b221 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -5,14 +5,14 @@ LABEL org.opencontainers.image.title=OliveTin RUN mkdir -p /config /var/www/olivetin \ && \ - microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ + microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ iputils \ shadow-utils \ - openssh-clients + openssh-clients -RUN useradd --system --create-home olivetin -u 1000 +RUN useradd --system --create-home olivetin -u 1000 -EXPOSE 1337/tcp +EXPOSE 1337/tcp VOLUME /config diff --git a/Dockerfile.armv7 b/Dockerfile.armv7 index c7e9bab..ae004e7 100644 --- a/Dockerfile.armv7 +++ b/Dockerfile.armv7 @@ -5,14 +5,14 @@ LABEL org.opencontainers.image.title=OliveTin RUN mkdir -p /config /var/www/olivetin \ && \ - microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ + microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \ iputils \ - shadow-utils \ - openssh-clients + shadow-utils \ + openssh-clients -RUN useradd --system --create-home olivetin -u 1000 +RUN useradd --system --create-home olivetin -u 1000 -EXPOSE 1337/tcp +EXPOSE 1337/tcp VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index ff5ffe9..f39f6a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { sh 'make go-tools' } } - + stage('Compile') { steps { withEnv(["PATH+GO=/root/go/bin/"]) { @@ -25,9 +25,9 @@ pipeline { } } } - + stage ('Post-Compile') { - parallel { + parallel { stage('Codestyle') { steps { withEnv(["PATH+GO=/root/go/bin/"]) { @@ -45,6 +45,6 @@ pipeline { } } } - + } } diff --git a/Makefile b/Makefile index 5486db0..107dade 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ compile: daemon-compile-x64-lin -daemon-compile-armhf: +daemon-compile-armhf: GOARCH=arm GOARM=6 go build -o OliveTin.armhf github.com/OliveTin/OliveTin/cmd/OliveTin -daemon-compile-x64-lin: +daemon-compile-x64-lin: GOOS=linux go build -o OliveTin github.com/OliveTin/OliveTin/cmd/OliveTin daemon-compile-x64-win: @@ -14,7 +14,7 @@ daemon-compile: daemon-compile-armhf daemon-compile-x64-lin daemon-compile-x64-w daemon-codestyle: go fmt ./... go vet ./... - gocyclo -over 4 cmd internal + gocyclo -over 4 cmd internal gocritic check ./... daemon-unittests: @@ -24,7 +24,7 @@ daemon-unittests: githooks: cp -v .githooks/* .git/hooks/ - + go-tools: go install "github.com/bufbuild/buf/cmd/buf" go install "github.com/fzipp/gocyclo/cmd/gocyclo" @@ -37,7 +37,7 @@ go-tools: grpc: go-tools buf generate -dist: protoc +dist: protoc protoc: protoc --go_out=. --go-grpc_out=. --grpc-gateway_out=. -I .:/usr/include/ OliveTin.proto @@ -54,7 +54,7 @@ podman-container: integration-tests-docker-image: docker rm -f olivetin && docker rmi -f olivetin docker build -t olivetin:latest . - docker create --name olivetin -p 1337:1337 -v `pwd`/integration-tests/configs/:/config/ olivetin + docker create --name olivetin -p 1337:1337 -v `pwd`/integration-tests/configs/:/config/ olivetin devrun: compile killall OliveTin || true @@ -70,4 +70,4 @@ webui-codestyle: clean: rm -rf dist OliveTin OliveTin.armhf OliveTin.exe reports gen -.PHONY: grpc +.PHONY: grpc diff --git a/README.md b/README.md index ebf534e..36fd3ff 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ project logo -OliveTin gives **safe** and **simple** access to predefined shell commands from a web interface. +OliveTin gives **safe** and **simple** access to predefined shell commands from a web interface. [![Discord](https://img.shields.io/discord/846737624960860180?label=Discord%20Server)](https://discord.gg/jhYWWpNJ3v) [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/awesome-selfhosted/awesome-selfhosted#automation) @@ -11,7 +11,7 @@ OliveTin gives **safe** and **simple** access to predefined shell commands from [![Go Report Card](https://goreportcard.com/badge/github.com/Olivetin/OliveTin)](https://goreportcard.com/report/github.com/OliveTin/OliveTin) [![Build Snapshot](https://github.com/OliveTin/OliveTin/actions/workflows/build-snapshot.yml/badge.svg)](https://github.com/OliveTin/OliveTin/actions/workflows/build-snapshot.yml) -## Use cases +## Use cases **Safely** give access to commands, for less technical people; @@ -34,10 +34,10 @@ OliveTin gives **safe** and **simple** access to predefined shell commands from ## Features * **Responsive, touch-friendly UI** - great for tablets and mobile -* **Super simple config in YAML** - because if it's not YAML now-a-days, it's not "cloud native" :-) +* **Super simple config in YAML** - because if it's not YAML now-a-days, it's not "cloud native" :-) * **Dark mode** - for those of you that roll that way. -* **Accessible** - passes all the accessibility checks in Firefox, and issues with accessibility are taken seriously. -* **Container** - available for quickly testing and getting it up and running, great for the selfhosted community. +* **Accessible** - passes all the accessibility checks in Firefox, and issues with accessibility are taken seriously. +* **Container** - available for quickly testing and getting it up and running, great for the selfhosted community. * **Integrate with anything** - OliveTin just runs Linux shell commands, so theoretially you could integrate with a bunch of stuff just by using curl, ping, etc. However, writing your own shell scripts is a great way to extend OliveTin. * **Lightweight on resources** - uses only a few MB of RAM and barely any CPU. Written in Go, with a web interface written as a modern, responsive, Single Page App that uses the REST/gRPC API. * **Good amount of unit tests and style checks** - helps potential contributors be consistent, and helps with maintainability. @@ -48,17 +48,17 @@ Desktop web browser; ![Desktop screenshot](media/screenshotDesktop.png) -Desktop web browser (dark mode); +Desktop web browser (dark mode); ![Desktop screenshot](media/screenshotDesktopDark.png) -Mobile screen size (responsive layout); +Mobile screen size (responsive layout); ![Mobile screenshot](media/screenshotMobile.png) ## Documentation -All documentation can be found at http://docs.olivetin.app . This includes installation and usage guide, etc. +All documentation can be found at http://docs.olivetin.app . This includes installation and usage guide, etc. ### Quickstart reference for `config.yaml` @@ -75,19 +75,19 @@ Put this `config.yaml` in `/etc/OliveTin/` if you're running a standard service, ```yaml # Listen on all addresses available, port 1337 -listenAddressSingleHTTPFrontend: 0.0.0.0:1337 +listenAddressSingleHTTPFrontend: 0.0.0.0:1337 # Choose from INFO (default), WARN and DEBUG logLevel: "INFO" # Actions (buttons) to show up on the WebUI: -actions: - # Docs: https://docs.olivetin.app/action-container-control.html +actions: + # Docs: https://docs.olivetin.app/action-container-control.html - title: Restart Plex icon: restart shell: docker restart plex - - # This will send 1 ping + + # This will send 1 ping # Docs: https://docs.olivetin.app/action-ping.html - title: Ping host shell: ping {{ host }} -c {{ count }} @@ -102,7 +102,7 @@ actions: title: Count type: int default: 1 - + # Restart http on host "webserver1" # Docs: https://docs.olivetin.app/action-ssh.html - title: restart httpd @@ -111,4 +111,3 @@ actions: ``` A full example config can be found at in this repository - [config.yaml](https://github.com/OliveTin/OliveTin/blob/main/config.yaml). - diff --git a/SECURITY.md b/SECURITY.md index e852ab0..f0a4010 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,7 +2,7 @@ ## Supported Versions -Currently, only the `main` branch is "supported". +Currently, only the `main` branch is "supported". | Version | Supported | | ------- | ------------------ | @@ -10,4 +10,4 @@ Currently, only the `main` branch is "supported". ## Reporting a Vulnerability -Please email `contact@jread.com` for responsible disclosure. Accepted issues will be made public once patched, and you will be given credit. +Please email `contact@jread.com` for responsible disclosure. Accepted issues will be made public once patched, and you will be given credit. diff --git a/buf.gen.yaml b/buf.gen.yaml index ae3bb91..c5b5b9b 100644 --- a/buf.gen.yaml +++ b/buf.gen.yaml @@ -17,4 +17,3 @@ plugins: # - name: openapiv2 # out: reports/openapiv2 - diff --git a/buf.yaml b/buf.yaml index ef2ec64..a8230a7 100644 --- a/buf.yaml +++ b/buf.yaml @@ -1,5 +1,5 @@ version: v1 -deps: +deps: - buf.build/googleapis/googleapis lint: use: diff --git a/config.yaml b/config.yaml index a7ac3f3..4a03017 100644 --- a/config.yaml +++ b/config.yaml @@ -1,15 +1,15 @@ -# There is a built-in micro proxy that will host the webui and REST API all on -# one port (this is called the "Single HTTP Frontend") and means you just need -# one open port in the container/firewalls/etc. +# There is a built-in micro proxy that will host the webui and REST API all on +# one port (this is called the "Single HTTP Frontend") and means you just need +# one open port in the container/firewalls/etc. # # Listen on all addresses available, port 1337 -listenAddressSingleHTTPFrontend: 0.0.0.0:1337 +listenAddressSingleHTTPFrontend: 0.0.0.0:1337 # Choose from INFO (default), WARN and DEBUG logLevel: "INFO" # Actions (buttons) to show up on the WebUI: -actions: +actions: # This will run a simple script that you create. - title: Run backup script shell: /opt/backupScript.sh @@ -32,15 +32,15 @@ actions: type: int default: 1 description: How many times to do you want to ping? - + # Restart lightdm on host "server1" # Docs: https://docs.olivetin.app/action-ping.html - title: restart httpd icon: restart shell: ssh root@server1 'service httpd restart' - # OliveTin can run long-running jobs like Ansible playbooks. - # + # OliveTin can run long-running jobs like Ansible playbooks. + # # For such jobs, you will need to install ansible-playbook on the host where # you are running OliveTin, or in the container. # @@ -51,7 +51,7 @@ actions: timeout: 120 # OliveTin can control containers - docker is just a command line app. - # + # # However, if you are running in a container you will need to do some setup, # see the docs below. # @@ -76,4 +76,3 @@ actions: shell: sleep 5 timeout: 5 icon: "😪" - diff --git a/integration-tests/Makefile b/integration-tests/Makefile index a001d2f..e7dbf2c 100644 --- a/integration-tests/Makefile +++ b/integration-tests/Makefile @@ -1,6 +1,6 @@ cypress: npm install ./cypressRun.sh "general" - ./cypressRun.sh "hiddenNav" + ./cypressRun.sh "hiddenNav" .PHONY: cypress container diff --git a/integration-tests/README.md b/integration-tests/README.md index f4ddc4b..491677f 100644 --- a/integration-tests/README.md +++ b/integration-tests/README.md @@ -1 +1 @@ -# OliveTin-integration-tests \ No newline at end of file +# OliveTin-integration-tests diff --git a/integration-tests/Vagrantfile b/integration-tests/Vagrantfile index c11afd7..a50228e 100644 --- a/integration-tests/Vagrantfile +++ b/integration-tests/Vagrantfile @@ -2,7 +2,7 @@ # (eg, snapshot builds on GitHub) -Vagrant.configure("2") do |config| +Vagrant.configure("2") do |config| config.vm.box = "generic/centos8" config.vm.provision "shell", inline: "mkdir /etc/OliveTin && chmod o+w /etc/OliveTin/", privileged: true config.vm.provision "file", source: "configs/config.general.yaml/.", destination: "/etc/OliveTin/config.yaml" diff --git a/integration-tests/configs/config.general.yaml b/integration-tests/configs/config.general.yaml index a3b0b0e..eb34858 100644 --- a/integration-tests/configs/config.general.yaml +++ b/integration-tests/configs/config.general.yaml @@ -1,17 +1,17 @@ # # Integration Test Config: General -# +# -listenAddressSingleHTTPFrontend: 0.0.0.0:1337 +listenAddressSingleHTTPFrontend: 0.0.0.0:1337 logLevel: "DEBUG" -checkForUpdates: false +checkForUpdates: false -actions: +actions: - title: Ping Google.com shell: ping google.com -c 1 icon: ping - + - title: restart lightdm icon: poop shell: ssh root@overseer 'service lightdm restart' @@ -32,4 +32,3 @@ actions: - title: Restart Plex icon: smile shell: docker restart plex - diff --git a/integration-tests/configs/config.hiddenFooter.yaml b/integration-tests/configs/config.hiddenFooter.yaml index 9565139..a2fc7fa 100644 --- a/integration-tests/configs/config.hiddenFooter.yaml +++ b/integration-tests/configs/config.hiddenFooter.yaml @@ -1,12 +1,12 @@ # # Integration Test Config: General -# +# showFooter: false -checkForUpdates: false +checkForUpdates: false # Actions (buttons) to show up on the WebUI: -actions: +actions: - title: Ping example.com shell: ping example.com -c 1 icon: ping diff --git a/integration-tests/configs/config.hiddenNav.yaml b/integration-tests/configs/config.hiddenNav.yaml index f3ec261..4f32e94 100644 --- a/integration-tests/configs/config.hiddenNav.yaml +++ b/integration-tests/configs/config.hiddenNav.yaml @@ -1,14 +1,14 @@ # # Integration Test Config: General -# +# -listenAddressSingleHTTPFrontend: 0.0.0.0:1337 +listenAddressSingleHTTPFrontend: 0.0.0.0:1337 showNavigation: false -checkForUpdates: false +checkForUpdates: false # Actions (buttons) to show up on the WebUI: -actions: +actions: - title: Ping example.com shell: ping example.com -c 1 icon: ping diff --git a/integration-tests/cypress/integration/general/defaultHomepageRender.spec.js b/integration-tests/cypress/integration/general/defaultHomepageRender.spec.js index 8c54410..f6c38d4 100644 --- a/integration-tests/cypress/integration/general/defaultHomepageRender.spec.js +++ b/integration-tests/cypress/integration/general/defaultHomepageRender.spec.js @@ -17,5 +17,3 @@ describe('Homepage rendering', () => { }) }) }); - - diff --git a/integration-tests/cypress/integration/hiddenFooter/hiddenFooter.spec.js b/integration-tests/cypress/integration/hiddenFooter/hiddenFooter.spec.js index faf5f52..c19965f 100644 --- a/integration-tests/cypress/integration/hiddenFooter/hiddenFooter.spec.js +++ b/integration-tests/cypress/integration/hiddenFooter/hiddenFooter.spec.js @@ -10,5 +10,3 @@ describe('Hidden Footer', () => { }) }) }); - - diff --git a/integration-tests/cypress/integration/hiddenNav/hiddenNav.spec.js b/integration-tests/cypress/integration/hiddenNav/hiddenNav.spec.js index 387bf20..abb6602 100644 --- a/integration-tests/cypress/integration/hiddenNav/hiddenNav.spec.js +++ b/integration-tests/cypress/integration/hiddenNav/hiddenNav.spec.js @@ -14,5 +14,3 @@ describe('Hidden Nav', () => { }) }) }); - - diff --git a/integration-tests/cypress/support/commands.js b/integration-tests/cypress/support/commands.js index 72b085b..119ab03 100644 --- a/integration-tests/cypress/support/commands.js +++ b/integration-tests/cypress/support/commands.js @@ -23,4 +23,3 @@ // // -- This will overwrite an existing command -- // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... }) - diff --git a/integration-tests/cypressRun.sh b/integration-tests/cypressRun.sh index 9732a15..da959c1 100755 --- a/integration-tests/cypressRun.sh +++ b/integration-tests/cypressRun.sh @@ -8,4 +8,3 @@ cp -f ./configs/config.$1.yaml ./configs/config.yaml docker start olivetin NO_COLOR=1 ./node_modules/.bin/cypress run --headless -s cypress/integration/$1/* || true docker kill olivetin - diff --git a/var/initscript/OliveTin b/var/initscript/OliveTin index 4942037..b8b6779 100755 --- a/var/initscript/OliveTin +++ b/var/initscript/OliveTin @@ -48,7 +48,7 @@ stop() status() { PID=$(pidof OliveTin) - RETVAL=$? + RETVAL=$? if [ $RETVAL -eq 1 ] ; then echo "OliveTin is stopped" diff --git a/var/openrc/OliveTin b/var/openrc/OliveTin index 9d7f3d3..bf112ff 100755 --- a/var/openrc/OliveTin +++ b/var/openrc/OliveTin @@ -4,4 +4,4 @@ name=$RC_SVCNAME description="OliveTin" command="/usr/local/bin/OliveTin" pidfile="/run/${RC_SVCNAME}.pid" -command_background=true \ No newline at end of file +command_background=true diff --git a/webui/index.html b/webui/index.html index f806fca..4fd8298 100644 --- a/webui/index.html +++ b/webui/index.html @@ -63,10 +63,10 @@ @@ -98,11 +98,11 @@