Fixing conflicts

.github/workflows/publish-action.yml

@@ -77,7 +77,17 @@ jobs:
     - name: Install OAuth server dependencies
       run: yarn install
       working-directory: ./server
+    - name: Download and Unzip eSignerCKA Setup
+      run: | 
+        Invoke-WebRequest -OutFile CodeSignTool.zip "https://www.ssl.com/download/codesigntool-for-windows"
+        Expand-Archive -Force CodeSignTool.zip
+        Remove-Item CodeSignTool.zip
     - name: Publish
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        WINDOWS_SIGN_USER_NAME: ${{ secrets.WINDOWS_SIGN_USER_NAME }}
+        WINDOWS_SIGN_USER_PASSWORD: ${{ secrets.WINDOWS_SIGN_USER_PASSWORD }}
+        WINDOWS_SIGN_CREDENTIAL_ID: ${{ secrets.WINDOWS_SIGN_CREDENTIAL_ID }}
+        WINDOWS_SIGN_USER_TOTP: ${{ secrets.WINDOWS_SIGN_USER_TOTP }}
       run: npm run publish
+

build/signWindows.js

@@ -16,14 +16,16 @@ function sign(configuration) {
   const USER_TOTP = process.env.WINDOWS_SIGN_USER_TOTP;
   if (USER_NAME && USER_PASSWORD && USER_TOTP && CREDENTIAL_ID) {
     console.log(`Signing ${configuration.path}`);
-    const { base, dir } = path.parse(configuration.path);
+    const { name, dir } = path.parse(configuration.path);
     // CodeSignTool can't sign in place without verifying the overwrite with a
     // y/m interaction so we are creating a new file in a temp directory and
     // then replacing the original file with the signed file.
-    const tempFile = path.join(TEMP_DIR, base);
-    const signFile = `build/CodeSignTool-v1.2.7/CodeSignTool.sh sign -input_file_path="${configuration.path}" -output_dir_path="${TEMP_DIR}" -credential_id="${CREDENTIAL_ID}" -username="${USER_NAME}" -password="${USER_PASSWORD}" -totp_secret="${USER_TOTP}"`;
+    const tempFile = path.join(TEMP_DIR, name);
+    const setDir = `cd CodeSignTool/CodeSignTool-v1.2.7-windows`;
+    const signFile = `"CodeSignTool" sign -input_file_path="${configuration.path}" -output_dir_path="${TEMP_DIR}" -credential_id="${CREDENTIAL_ID}" -username="${USER_NAME}" -password="${USER_PASSWORD}" -totp_secret="${USER_TOTP}"`;
     const moveFile = `mv "${tempFile}" "${dir}"`;
-    childProcess.execSync(`${signFile} && ${moveFile}`, { stdio: 'inherit' });
+    childProcess.execSync(`${setDir} && ${signFile}`, { stdio: 'inherit' });
+    childProcess.execSync(`${moveFile}`, { stdio: 'inherit' });
   } else {
     console.warn(`sign.js - Can't sign file ${configuration.path}, missing value for:
 ${USER_NAME ? '' : 'WINDOWS_SIGN_USER_NAME'}

package.json

@@ -1,13 +1,13 @@
 {
   "name": "yattie",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "engines": {
     "npm": ">=8.0.0 <9.0.0",
     "node": ">=16.0.0 <17.0.0"
   },
   "keywords": [],
   "author": {
-    "name": "YATT",
+    "name": "YATT, Inc",
     "email": "contact@yatt.ai"
   },
   "license": "GPL-3.0-only",

src/components/CheckTaskWrapper.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="task-wrapper">
-    <div class="subtitle-2 label-text">{{ $tc("caption.checklist", 1) }}</div>
+    <div
+      class="subtitle-2 label-text"
+      :style="{ color: currentTheme.secondary }"
+    >
+      {{ $tc("caption.checklist", 1) }}
+    </div>
     <div class="list">
       <v-form ref="form" v-model="valid" lazy-validation>
         <div class="" v-for="task in tasks" :key="task.id">
@@ -62,6 +67,13 @@ export default {
         el.scrollIntoView();
       }
     },
+    currentTheme() {
+      if (this.$vuetify.theme.dark) {
+        return this.$vuetify.theme.themes.dark;
+      } else {
+        return this.$vuetify.theme.themes.light;
+      }
+    },
   },
 };
 </script>
@@ -70,4 +82,46 @@ export default {
   display: block;
   padding: 12px;
 }
+.task-wrapper .subtitle-2 {
+  font-size: 14px;
+}
+.task-wrapper .list {
+  display: flex;
+  flex-direction: column;
+  row-gap: 10px;
+  margin-top: 10px;
+}
+.task-wrapper .list > .one {
+  display: flex;
+  align-items: center;
+  column-gap: 10px;
+}
+.task-wrapper .list > .one > input[type="checkbox"]:checked {
+  accent-color: #7c3aed;
+}
+.task-wrapper .list > .one > content {
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 20px;
+}
+.error1 {
+  background-color: #fef2f2 !important;
+  padding: 10px;
+  display: flex;
+  column-gap: 10px;
+  margin-top: 10px;
+}
+.error1 > .content > .title {
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 20px;
+  color: #991b1b;
+}
+.error1 > .content > .desc {
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 20px;
+  color: #b91c1c;
+  margin-top: 5px;
+}
 </style>