Merge pull request #134 from juntofoundation/dev

v0.2.7
coasys · Oct 11, 2021 · 1f05034 · 1f05034
2 parents d152745 + e2cb033
commit 1f05034
Show file tree

Hide file tree

Showing 14 changed files with 182 additions and 142 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,6 +30,21 @@ jobs:
         run: |
           brew install libsodium openssl
           rustup target add wasm32-unknown-unknown
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache cargo bin
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/bin
+          key: ${{ runner.os }}-cargo-bin-${{ hashFiles('**/Cargo.lock') }}
       - name: Build Holochain
         env:
           SQLCIPHER_STATIC: 1
@@ -50,11 +65,6 @@ jobs:
         run: |
           pkgver=$(node ./scripts/get-pkg-version.js)
           echo ::set-output name=version::$pkgver
-      - name: Setup codesiging certs
-        run: ./scripts/add-osx-cert.sh
-        env:
-          COMMUNITIES_APPLE_CERT: ${{ secrets.COMMUNITIES_APPLE_CERT }}
-          COMMUNITIES_APPLE_CERT_PASSWORD: ${{ secrets.COMMUNITIES_APPLE_CERT_PASSWORD }}
       - name: Install deps
         run: npm i
       - name: Build languages
@@ -63,6 +73,8 @@ jobs:
         run: npm run release
         env:
           GH_TOKEN: ${{ secrets.github_token }}
+          CSC_LINK: ${{ secrets.COMMUNITIES_APPLE_CERT }}
+          CSC_KEY_PASSWORD: ${{ secrets.COMMUNITIES_APPLE_CERT_PASSWORD }}
       - name: Cache macOS release (x64)
         uses: actions/upload-artifact@v1
         with:
@@ -138,6 +150,21 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y build-essential libssl-dev libsqlcipher-dev
           rustup target add wasm32-unknown-unknown
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/git
+          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
+      - name: Cache cargo bin
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/bin
+          key: ${{ runner.os }}-cargo-bin-${{ hashFiles('**/Cargo.lock') }}
       - name: Build Holochain
         env:
           SQLCIPHER_STATIC: 1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,31 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).  
 This project *loosely* adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). More specifically:
 
+## [0.2.7] - 11/10/2021
+
+### Added
+ - Cargo caching to Github actions release build
+ - More detailed information when joining a community
+
+### Changed
+ - Tweak size and type of avatar upload button
+ - Improved join/create community
+
+### Deprecated
+
+### Removed
+
+### Fixed
+ - Broken jest config for test
+ - Profile picture being too large and killing holochain (now use IPFS for storage)
+ - Community picture being too large and killing holochain (now use IPFS for storage)
+ - Bug where ad4m would not be killed correctly in production MacOS
+ - Links in gitbook opening in the electron browser window (now opens in default browser)
+
+### Security
+
+---
+
 ## [0.2.6] - 07/10/2021
 
 ### Added

diff --git a/jest.config.js b/jest.config.js
@@ -4,10 +4,10 @@ const { pathsToModuleNameMapper } = require("ts-jest/utils");
 const { compilerOptions } = require("./tsconfig");
 
 const esModules = [
-  "@junto-foundation/junto-elements",
+  // "@junto-foundation/junto-elements",
   "runtime-dom",
   "register-service-worker",
-  "vue-advanced-cropper",
+  // "vue-advanced-cropper",
   "vue3-observe-visibility2",
   "vue3-virtual-scroller",
 ].join("|");

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "junto",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "private": true,
   "description": "Junto ad4m chat application leveraging distributed & decentralized technologies",
   "author": "josh@junto.foundation",

diff --git a/scripts/add-osx-cert.sh b/scripts/add-osx-cert.sh
diff --git a/src/__tests__/fixtures/joinComunityExpressionTypes.json b/src/__tests__/fixtures/joinComunityExpressionTypes.json
@@ -1,36 +1,14 @@
 [
-  [
-    {
-      "languageAddress": "QmUZr2iiGxCNjXP97Wz9AdRRe6HESP7wDbmAbLTksFTAmn",
-      "expressionType": 0
-    },
-    {
-      "languageAddress": "QmUCLri8MRJVpXsBRvry8KaQEkX7RhKcqBwfAkMmTo6Swq",
-      "expressionType": 1
-    },
-    {
-      "languageAddress": "QmUWgoGt6QAMfagvQkjsHN2X3egtu3P8bcqymYMjxnqFzQ",
-      "expressionType": 2
-    }
-  ],
-  [
-    {
-      "languageAddress": "QmUZr2iiGxCNjXP97Wz9AdRRe6HESP7wDbmAbLTksFTAmn",
-      "name": "social-context",
-      "createIcon": "",
-      "viewIcon": ""
-    },
-    {
-      "languageAddress": "QmUCLri8MRJVpXsBRvry8KaQEkX7RhKcqBwfAkMmTo6Swq",
-      "name": "languages",
-      "createIcon": "",
-      "viewIcon": ""
-    },
-    {
-      "languageAddress": "QmUWgoGt6QAMfagvQkjsHN2X3egtu3P8bcqymYMjxnqFzQ",
-      "name": "group-expression",
-      "createIcon": "",
-      "viewIcon": ""
-    }
-  ]
+  {
+    "languageAddress": "QmUZr2iiGxCNjXP97Wz9AdRRe6HESP7wDbmAbLTksFTAmn",
+    "expressionType": 0
+  },
+  {
+    "languageAddress": "QmUCLri8MRJVpXsBRvry8KaQEkX7RhKcqBwfAkMmTo6Swq",
+    "expressionType": 1
+  },
+  {
+    "languageAddress": "QmUWgoGt6QAMfagvQkjsHN2X3egtu3P8bcqymYMjxnqFzQ",
+    "expressionType": 2
+  }
 ]
diff --git a/src/ad4m-globals.ts b/src/ad4m-globals.ts
@@ -2,10 +2,10 @@ export const SOCIAL_CONTEXT_OFFICIAL =
   "QmS4QVRcLBskgnq2AuV3TaKn9Xb4evgBsGcbwDXVv3Lm7n";
 
 export const GROUP_EXPRESSION_OFFICIAL =
-  "Qmd7Wssoo9kwzdqJBE5aSE7YyVJ4TmD5mqX7L8yffR8MU7";
+  "QmYT67T2XbSN2WgtB8CKW3Kr7AxCSqSUypeNxYXEsq4fE5";
 
 export const PROFILE_EXPRESSION_OFFICIAL =
-  "QmSuJWiQFYWba6siE1fcKcP3yTYE7BssGg22UKShWGMVgp";
+  "QmTTYB2E8tXRDt5ZHSMbVuZ71jZDzWJM6U9YcL86aheoz8";
 
 export const SHORTFORM_EXPRESSION_OFFICIAL =
   "QmVDh4jd75BgPgiV6Lttjm7xQ8JQBkQJtqwBcPn4xZyXgP";

diff --git a/src/components/avatar-upload/AvatarUpload.vue b/src/components/avatar-upload/AvatarUpload.vue
@@ -10,7 +10,7 @@
           size="xl"
         ></j-icon>
       </div>
-      <j-button v-if="!value" size="sm">Upload image</j-button>
+      <j-button variant="subtle" v-if="!value" size="sm">Upload image</j-button>
       <j-button v-if="value" @click.prevent="$emit('change', null)" size="sm">
         Remove image
       </j-button>
@@ -99,16 +99,16 @@ export default defineComponent({
   background-size: cover;
 }
 .avatar-upload j-avatar {
-  --j-avatar-size: 150px;
+  --j-avatar-size: 7rem;
 }
 
 .avatar-upload__avatar {
   display: grid;
   place-items: center;
   background: var(--j-color-ui-200);
   text-align: center;
-  width: 150px;
-  height: 150px;
+  width: 7rem;
+  height: 7rem;
   border-radius: 50%;
 }
 

diff --git a/src/components/structured-text/StructuredText.vue b/src/components/structured-text/StructuredText.vue
@@ -49,7 +49,12 @@ export default defineComponent({
         renderRule(isLink, ({ node, children, key }) => {
           return h(
             `a`,
-            { key, href: node.url, style: "color: var(--j-color-primary-500)" },
+            {
+              key,
+              target: "_blank",
+              href: node.url,
+              style: "color: var(--j-color-primary-500)",
+            },
             [...(children || [])]
           );
         }),