Merge remote-tracking branch 'smile/main' into smile_template

.github/workflows/deploy-hash.yml

@@ -175,6 +175,10 @@ jobs:
           remote_user: ${{ secrets.EXP_DEPLOY_USER }}
           remote_key: ${{ secrets.EXP_DEPLOY_KEY  }}
 
+      # make .htaccess file and add wasm mime type
+      - name: create the .htaccess file and add the wasm mime type
+        run: echo "AddType application/wasm wasm" > dist/.htaccess
+
       # send a notification at the end
       - name: Send notification to lab slack
         env:

.github/workflows/deploy.yml

@@ -45,7 +45,7 @@ jobs:
       # install node packages
       - name: Build css from scss
         run: npm run css-build
-        
+
       # accesses some git variables and processes them to be lower case/short/escaped
       - name: Inject slug/short variables
         uses: rlespinasse/[email protected]
@@ -55,6 +55,16 @@ jobs:
         env:
           ENV_FILE: 'env/.env.git.local'
         run: |
+          escape_quotes() {
+            # Get the input string
+            input="$1"
+            # Escape single quotes
+            input="${input//\'/\'}"
+            # Escape double quotes
+            input="${input//\"/\\\"}"
+            # Return the escaped string
+            echo "$input"
+          }
           echo "------"
           echo "# DO NOT EDIT THIS FILE IT IS AUTOMATICALLY GENERATED" > $ENV_FILE
           if test -z "${{ env.GITHUB_REPOSITORY_NAME_PART_SLUG }}"
@@ -155,7 +165,12 @@ jobs:
 
       # Build the web app
       - name: Build web app
-        run: npm run build
+        run: |
+          if ${{ github.ref == 'refs/heads/presentation'}}; then 
+            npm run build:present 
+          else
+            npm run build
+          fi
 
       # make remote folder if necessar
       - name: create the remote folders if they don't exist
@@ -195,7 +210,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
         if: ${{ env.SLACK_WEBHOOK_URL != '' }} # this should only run if SLACK_WEBHOOK exists
         id: slack
-        uses: slackapi/slack-github-action@v1.19.0
+        uses: slackapi/slack-github-action@v1.24.0
         with:
           # This data can be any valid JSON from a previous step in the GitHub Action
           payload: |

.prettierrc

@@ -1,5 +1,6 @@
 {
   "semi": false,
   "singleQuote": true,
-  "trailingComma": "es5"
+  "trailingComma": "es5",
+  "printWidth": 120
 }

README.md

@@ -4,10 +4,9 @@ A happy approach to online research.
 
 Online docs: [https://smile.gureckislab.org](https://smile.gureckislab.org)
 
-
 ## Required software to work on this
 
 - [VS Code](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar)
 - [Node.js](https://nodejs.org/en/download/)
-- A git client
-- The [GitHub command line tool](https://cli.github.com)
+- A git client (VS Code built in works!)
+- The [GitHub command line tool](https://cli.github.com)

docs/.vitepress/config.js

@@ -36,6 +36,7 @@ export default defineConfig({
           { text: '📦 Data storage', link: '/datastorage' },
           { text: '👩‍💻 Developing', link: '/developing' },
           { text: '🐞 Testing', link: '/testing' },
+          { text: '👩‍🏫 Presentation mode', link: '/presentation' },
           { text: '🧪 Lab Config', link: '/labconfig' },
         ],
       },
@@ -47,10 +48,10 @@ export default defineConfig({
           { text: '🔀 Timeline', link: '/timeline' },
           { text: '🎲 Randomization', link: '/randomization' },
           { text: '🧑‍🎨 Styling, CSS, and icons', link: '/style' },
-          { text: '💰 Computing bonuses', link: '/bonuses' },
+          //{ text: '💰 Computing bonuses', link: '/bonuses' },
           { text: '🆘 Errors and other issues', link: '/problems' },
           { text: '🧐 Analyzing data', link: '/analysis' },
-          { text: '🔌 Server-side Computations', link: '/server' },
+          //{ text: '🔌 Server-side Computations', link: '/server' },
         ],
       },
       {

docs/.vitepress/theme/DarkModeImage.vue

@@ -1,9 +1,8 @@
-
 <style>
 .dark img {
-    filter: invert(1);
+  filter: invert(1);
 }
 img {
-    filter: invert(0);
+  filter: invert(0);
 }
-</style>
+</style>

docs/.vitepress/theme/GureckisLabText.vue

@@ -1,13 +1,13 @@
 <template>
-    <span class="gureckislab">
-        <a href="https://gureckislab.org/">gureckislab</a>
-    </span>
+  <span class="gureckislab">
+    <a href="https://gureckislab.org/">gureckislab</a>
+  </span>
 </template>
 
 <style lang="css">
 .gureckislab {
-    font-family: 'consolas', monospace;
-    font-size: 0.95em;
-    text-decoration: underline dotted;
+  font-family: 'consolas', monospace;
+  font-size: 0.95em;
+  text-decoration: underline dotted;
 }
-</style>
+</style>

docs/.vitepress/theme/SmileText.vue

@@ -1,3 +1,3 @@
 <template>
-    <b>🫠 Smile</b>
-</template>
+  <b>🫠 Smile</b>
+</template>

docs/.vitepress/theme/index.js

@@ -1,13 +1,13 @@
-import DefaultTheme from 'vitepress/theme';
-import DarkModeImage from './DarkModeImage.vue';
-import GureckisLabText from './GureckisLabText.vue';
-import SmileText from './SmileText.vue';
+import DefaultTheme from 'vitepress/theme'
+import DarkModeImage from './DarkModeImage.vue'
+import GureckisLabText from './GureckisLabText.vue'
+import SmileText from './SmileText.vue'
 
 export default {
   ...DefaultTheme,
   enhanceApp({ app }) {
-    app.component('DarkModeImage', DarkModeImage);
-    app.component('GureckisLabText', GureckisLabText);
-    app.component('SmileText', SmileText);
+    app.component('DarkModeImage', DarkModeImage)
+    app.component('GureckisLabText', GureckisLabText)
+    app.component('SmileText', SmileText)
   },
-};
+}