chore: merge release-v0.1.0 into main

mrjackwills · Feb 12, 2023 · 83acf5f · 83acf5f
2 parents dcee65d + 54dbf80
commit 83acf5f
Show file tree

Hide file tree

Showing 19 changed files with 8,380 additions and 6,277 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,7 +1,7 @@
 ARG VARIANT="bullseye"
 FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
 
-RUN printf "alias cls='clear'\nalias ll='ls -l --human-readable --color=auto --group-directories-first --classify --time-style=long-iso -all'" >> /etc/bash.bashrc
+RUN printf "alias cls='clear'\nalias ll='ls -l --human-readable --color=auto --group-directories-first --classify --time-style=long-iso -all'\n" >> /etc/bash.bashrc
 
 ENV PATH="/home/vscode/.cargo/bin:${PATH}"
 

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -20,36 +20,48 @@
 		"source=/etc/localtime,target=/etc/localtime,type=bind,readonly"
 	],
 
+	"postCreateCommand": "cargo install typos-cli tauri-cli",
 
-	// Set *default* container specific settings.json values on container create.
-	"settings": {
-		"lldb.executable": "/usr/bin/lldb",
-		// VS Code don't watch files under ./target
-		"files.watcherExclude": {
-			"**/target/**": true
-		},
-		"rust-analyzer.checkOnSave.command": "clippy"
-	},
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"vadimcn.vscode-lldb",
-		"mutantdino.resourcemonitor",
-		"rust-lang.rust-analyzer",
-		"tamasfe.even-better-toml",
-		"serayuzgur.crates",
-		"christian-kohler.path-intellisense",
-		"timonwong.shellcheck",
-		"ms-vscode.live-server",
-		"rangav.vscode-thunder-client",
-		"bmuskalla.vscode-tldr"
-	],
+	"customizations": {
+		"vscode": {
+				// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"bmuskalla.vscode-tldr",
+				"christian-kohler.path-intellisense",
+				"ms-vscode.live-server",
+				"mutantdino.resourcemonitor",
+				"rangav.vscode-thunder-client",
+				"rust-lang.rust-analyzer",
+				"serayuzgur.crates",
+				"tamasfe.even-better-toml",
+				"timonwong.shellcheck",
+				"vadimcn.vscode-lldb"
+			],
 
+			"settings": {
+				"lldb.executable": "/usr/bin/lldb",
+				// VS Code don't watch files under ./target
+				"files.watcherExclude": {
+					"**/target/**": true
+				},
+				"rust-analyzer.checkOnSave.command": "clippy"
+			}
+		}
+	},
 
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode",
 	"features": {
-		"docker-in-docker": "latest",
-		"git": "os-provided"
+		"ghcr.io/devcontainers/features/node:1": {
+
+		},
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {
+			"version": "latest",
+			"moby": true,
+			"dockerDashComposeVersion":"v2"
+		},
+		"ghcr.io/devcontainers/features/git:1": {
+				"version":"os-provided"
+			}
 	}
 }
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
@@ -1,6 +1,13 @@
 {
   "globals": {
+    "Component": true,
+    "ComponentPublicInstance": true,
+    "ComputedRef": true,
     "EffectScope": true,
+    "InjectionKey": true,
+    "PropType": true,
+    "Ref": true,
+    "VNode": true,
     "computed": true,
     "createApp": true,
     "customRef": true,
@@ -40,7 +47,6 @@
     "readonly": true,
     "ref": true,
     "resolveComponent": true,
-    "resolveDirective": true,
     "settingModule": true,
     "shallowReactive": true,
     "shallowReadonly": true,

diff --git a/.github/release-body.md b/.github/release-body.md
@@ -1,15 +1,19 @@
-### 2023-01-29
+### 2023-02-12
 
 ### Chores
-+ dependencies updated, [aab6e0adb5ee4069a69c2793c5c19e34a5ddf607], [6b4347be6c751459728747d46a65cf3a8f934196], [fe1f11a25ed8a6b322c4b42708afde05960d0030]
-+ github workflow main only, [4ba2aff3ec3ad2d2ebd8c14c068e610f0fa098c0]
++ create_releave v0.2.7, [a34f1f09fcbd1af01ee48fe535e7137d8aa32844], [0c691341003153361064d071a3301d4d24740c79]
++ typos.toml added, [15a2c2761f11bb7eab1b5be70f1c4bb017be9af8]
++ dev container updated, [44ced2d8fcf9ed0c957f910761771fc8892f5af5]
++ dependencies updated, [aef6f9ea6f0474f6c99745eed1660f7e51c14107]
 
 ### Docs
-+ readme updated, [144ebee9de3297ca246b4de64662eeca7e781f77], [350484ec54bb0d3ed2c0343a1058e764a9f7ea8f]
++ typos, [0b900357f0af0abfe32c080d06c260d721ca15bb], [40514c3cc773fd2af795c310c0aad246deac4d62]
 
-### Fixes
-+ hr styling, [3f216528c8f8763000dff63f5a04882706909fa0]
-+ long session logic fixed, [903079af9da926f78b5c06848023970caf0c57e4]
+### Features
++ openssl dependency removed, [cf01f3a493ac359093fb378b2e2e0c28afcd5c7b]
+
+### Reverts
++ github workflow branch removed, [62045b5732cb41f4bb3820a2605c62ca0dd37b30]
 
 
 see <a href='https://wwwhub.com/mrjackwills/obliqoro/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
diff --git a/.github/workflows/create_workflows.yml b/.github/workflows/create_workflows.yml
@@ -1,8 +1,6 @@
 name: Release CI
 on:
   push:
-    branch:
-      - 'main'
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+# <a href='https://wwwhub.com/mrjackwills/obliqoro/releases/tag/v0.1.0'>v0.1.0</a>
+### 2023-02-12
+
+### Chores
++ create_releave v0.2.7, [a34f1f09](https://wwwhub.com/mrjackwills/obliqoro/commit/a34f1f09fcbd1af01ee48fe535e7137d8aa32844), [0c691341](https://wwwhub.com/mrjackwills/obliqoro/commit/0c691341003153361064d071a3301d4d24740c79)
++ typos.toml added, [15a2c276](https://wwwhub.com/mrjackwills/obliqoro/commit/15a2c2761f11bb7eab1b5be70f1c4bb017be9af8)
++ dev container updated, [44ced2d8](https://wwwhub.com/mrjackwills/obliqoro/commit/44ced2d8fcf9ed0c957f910761771fc8892f5af5)
++ dependencies updated, [aef6f9ea](https://wwwhub.com/mrjackwills/obliqoro/commit/aef6f9ea6f0474f6c99745eed1660f7e51c14107)
+
+### Docs
++ typos, [0b900357](https://wwwhub.com/mrjackwills/obliqoro/commit/0b900357f0af0abfe32c080d06c260d721ca15bb), [40514c3c](https://wwwhub.com/mrjackwills/obliqoro/commit/40514c3cc773fd2af795c310c0aad246deac4d62)
+
+### Features
++ openssl dependency removed, [cf01f3a4](https://wwwhub.com/mrjackwills/obliqoro/commit/cf01f3a493ac359093fb378b2e2e0c28afcd5c7b)
+
+### Reverts
++ github workflow branch removed, [62045b57](https://wwwhub.com/mrjackwills/obliqoro/commit/62045b5732cb41f4bb3820a2605c62ca0dd37b30)
+
 # <a href='https://wwwhub.com/mrjackwills/obliqoro/releases/tag/v0.0.5'>v0.0.5</a>
 ### 2023-01-29
 

diff --git a/README.md b/README.md
@@ -12,6 +12,7 @@
  <a href='https://vuejs.org' target='_blank' rel='noopener noreferrer'>Vue3</a>,
  and <a href='https://www.typescriptlang.org/' target='_blank' rel='noopener noreferrer'>Typescript</a>,
  using <a href='https://www.tauri.app/' target='_blank' rel='noopener noreferrer'>Tauri</a>,
+ <a href='https://vuetifyjs.com/' target='_blank' rel='noopener noreferrer'>Vuetify</a>,
  and <a href='https://www.sqlite.org/' target='_blank' rel='noopener noreferrer'>SQLite</a>
 </p>
 
@@ -67,12 +68,11 @@ See the <a href='https://github.com/mrjackwills/obliqoro/releases/latest' target
 + [ ] Frontend link to the location of the SQLite file on disk
 + [ ] Testing on Mac
 + [ ] Password for exiting a long break?
-+ [ ] Removal of OpenSSL Rust dependency
 + [ ] Setting to enable writing logs to file when on production version
 
 ### Development
 
-Requires Node & Rust to be installed installed
+Requires Node & Rust to be installed
 
 ```bash
 git clone https://www.github.com/mrjackwills/obliqoro.git

diff --git a/create_release.sh b/create_release.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # rust create_release
-# v0.1.2
+# v0.2.7
 
 STAR_LINE='****************************************'
 CWD=$(pwd)
@@ -176,30 +176,50 @@ ask_continue () {
 	fi
 }
 
+# $1 text to colourise
+release_continue () {
+	echo -e "\n${PURPLE}$1${RESET}"
+	ask_continue
+}
+
 # run all tests
 cargo_test () {
 	cargo test -- --test-threads=1
 	ask_continue
 }
 
-# Build all releases that GitHub workflow would
-# This will download GB's of docker images
-cargo_build () {
+# build for production, as Github action would do
+cargo_build() {
+	echo -e "\n${GREEN}cargo tauri build${RESET}"
 	cargo tauri build
+	ask_continue
 }
 
-# $1 text to colourise
-release_continue () {
-	echo -e "\n${PURPLE}$1${RESET}"
+check_typos () {
+	echo -e "\n${YELLOW}checking for typos${RESET}"
+	typos
 	ask_continue
+}
+
 
+cargo_fmt_check() {
+	cd "src-tauri" || error_close "Can't find src-tauri"
+	echo -e "\n${GREEN}cargo fmt${RESET}"
+	cargo fmt
+	echo -e "\n${GREEN}cargo check${RESET}"
+	cargo check
+	cd "${CWD}" || error_close "Can't find ${CWD}"
 }
 # Full flow to create a new release
 release_flow() {
+
+	check_typos
+
 	check_git
 	get_git_remote_url
+
 	# cargo_test
-	# cargo_build
+	cargo_build
 
 	cd "${CWD}" || error_close "Can't find ${CWD}"
 	check_tag
@@ -218,10 +238,7 @@ release_flow() {
 	update_version_number_in_files
 	update_json
 
-	echo -e "\ncargo fmt"
-	cd src-tauri || error_close "Can't find src-tauri"
-	cargo fmt
-	cd "${CWD}" || error_close "Can't find ${CWD}"
+	cargo_fmt_check
 
 	release_continue "git add ."
 	git add .
@@ -230,9 +247,8 @@ release_flow() {
 	git commit -m "chore: release ${NEW_TAG_WITH_V}"
 
 	release_continue "git checkout main"
+	echo -e "git merge --no-ff \"${RELEASE_BRANCH}\" -m \"chore: merge ${RELEASE_BRANCH} into main\"" 
 	git checkout main
-
-	release_continue "git merge --no-ff \"${RELEASE_BRANCH}\" -m \"chore: merge ${RELEASE_BRANCH} into main\"" 
 	git merge --no-ff "$RELEASE_BRANCH" -m "chore: merge ${RELEASE_BRANCH} into main"
 
 	release_continue "git tag -am \"${RELEASE_BRANCH}\" \"$NEW_TAG_WITH_V\""