Merge branch 'main' into tests

.github/workflows/push-build.yml

@@ -1,9 +1,5 @@
 name: Build
-on:
-  push:
-    branches:
-      - main
-  pull_request:
+on: push
 
 jobs:
   build:
@@ -13,13 +9,6 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt, clippy
       - name: Lint (rustfmt)
         working-directory: src/backend
         run: cargo fmt -- --check
@@ -51,20 +40,24 @@ jobs:
       - name: Build frontend
         working-directory: src/frontend
         run: yarn build
-      - name: Copy "dist" folder
-        run: cp -r src/frontend/dist/. src/backend/dist/
+      - name: Compress frontend files
+        run: make compress
       - name: Build x86_64
         working-directory: src/backend
-        run: cross build --release --target x86_64-unknown-linux-musl
+        run: cross build --release --target x86_64-unknown-linux-musl --features compression
+      - name: Delete build artifacts
+        run: |
+          rm -r src/backend/target/release/build/*
+          rm src/backend/target/release/deps/*.so
       - name: Build armv6l
         working-directory: src/backend
-        run: cross build --release --target arm-unknown-linux-musleabihf
+        run: cross build --release --target arm-unknown-linux-musleabihf --features compression
       - name: Build armv7l
         working-directory: src/backend
-        run: cross build --release --target armv7-unknown-linux-musleabihf
+        run: cross build --release --target armv7-unknown-linux-musleabihf --features compression
       - name: Build aarch64
         working-directory: src/backend
-        run: cross build --release --target aarch64-unknown-linux-musl
+        run: cross build --release --target aarch64-unknown-linux-musl --features compression
       - uses: actions/upload-artifact@v2
         with:
           name: dietpi-dashboard-x86_64

.gitignore

@@ -5,6 +5,7 @@ dist/
 dietpi-dashboard
 .DS_Store
 target/
+src/backend/.cargo/
 
 # Yarn
 .yarn/*

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+ravenclaw900@protonmail.com.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

Makefile

@@ -1,34 +1,38 @@
-default: yarn publiccopy fmt
+build: yarn rustbuild
 
+rustbuild: distcopy fmt
+ifdef TARGET
+	cd src/backend; cargo build --target $(TARGET)
+	mv src/backend/target/$(TARGET)/debug/dietpi-dashboard .
+else
 	cd src/backend; cargo build
+	mv src/backend/target/debug/dietpi-dashboard .
+endif
 
-	$(MAKE) publicdelete
-
-	mv src/backend/target/debug/dietpi-dashboard ./dietpi-dashboard
-
-rust: publiccopy fmt 
-
-	cd src/backend; cargo build
+release: yarn compress
+ifdef TARGET
+	cd src/backend; cargo build --target $(TARGET) --release --features compression
+	mv src/backend/target/$(TARGET)/release/dietpi-dashboard .
+else
+	cd src/backend; cargo build --release --features compression
+	mv src/backend/target/release/dietpi-dashboard .
+endif
 
-	$(MAKE) publicdelete
+	rm -r src/backend/dist
 
-	mv src/backend/target/debug/dietpi-dashboard ./dietpi-dashboard
+# There may be a better, more 'make'y way of doing this, but find works for now
+compress: distcopy
+	find src/backend/dist ! -name '*.png' -type f -exec gzip -9 {} \; -exec mv {}.gz {} \;
 
 yarn:
 	cd src/frontend; yarn build
 
 ifdef TARGET
-	rm src/backend/target/$(TARGET)/debug/deps/dietpi_dashboard-*
+	rm -f src/backend/target/$(TARGET)/debug/deps/dietpi_dashboard-*
 else
-	rm src/backend/target/debug/deps/dietpi_dashboard-*
+	rm -f src/backend/target/debug/deps/dietpi_dashboard-*
 endif
 
-publiccopy:
-	cp -r src/frontend/dist src/backend
-
-publicdelete:
-	rm -r src/backend/dist
-
 fmt:
 	cd src/backend; cargo fmt
 ifdef TARGET
@@ -37,10 +41,6 @@ else
 	cd src/backend; cargo clippy
 endif
 
-rustdev: publiccopy fmt
-	cd src/backend; cargo build --target $(TARGET)
-	mv src/backend/target/$(TARGET)/debug/dietpi-dashboard ./dietpi-dashboard
-
-	$(MAKE) publicdelete
-
-dev: yarn rustdev
+distcopy:
+	rm -rf src/backend/dist
+	cp -r src/frontend/dist src/backend

config.toml

@@ -39,3 +39,8 @@
 # This will do 1 GitHub API call per day
 # - Default: true
 #update_check = true
+
+# Preferred temperature unit
+# - Options: fahrenheit, celsius
+# - Default: celsius
+#temp_unit = celsius