Merge branch 'develop' into fix/improve-desktop-faq-docker-windows

unipept · Apr 15, 2024 · d2798d4 · d2798d4
2 parents 24036c0 + 877a9c7
commit d2798d4
Show file tree

Hide file tree

Showing 195 changed files with 263,856 additions and 33,965 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -0,0 +1,4 @@
+> 1%
+last 2 versions
+not dead
+not ie 11
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -0,0 +1,35 @@
+module.exports = {
+    root: true,
+    env: {
+        browser: true,
+        commonjs: true,
+        es6: true,
+        'vue/setup-compiler-macros': true
+    },
+    extends: [
+        'plugin:vue/vue3-recommended',
+        'eslint:recommended',
+        '@vue/eslint-config-typescript/recommended'
+    ],
+    rules: {
+        '@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': 'allow-with-description' }],
+        '@typescript-eslint/explicit-function-return-type': 'off',
+        '@typescript-eslint/explicit-module-boundary-types': 'off',
+        '@typescript-eslint/no-empty-function': ['error', { allow: ['arrowFunctions'] }],
+        '@typescript-eslint/no-explicit-any': 'off',
+        '@typescript-eslint/no-non-null-assertion': 'off',
+        '@typescript-eslint/no-var-requires': 'off',
+        'vue/require-default-prop': 'off',
+        'vue/multi-word-component-names': 'off',
+        'vue/html-indent': ['warn', 4],
+        'vue/valid-v-slot': ['error', { allowModifiers: true }]
+    },
+    overrides: [
+        {
+            files: ['*.js'],
+            rules: {
+                '@typescript-eslint/explicit-function-return-type': 'off'
+            }
+        }
+    ]
+};
diff --git a/.github/workflows/build_for_pages.yml b/.github/workflows/build_for_pages.yml
@@ -1,27 +1,52 @@
-name: Publish web to GitHub Pages.
+# Simple workflow for deploying static content to GitHub Pages
+name: Deploy static content to Pages
 
 on:
+  # Runs on pushes targeting the default branch
   push:
     branches:
       - develop
+
+  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-
+
+# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
 permissions:
-  contents: write
-
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: 'pages'
+  cancel-in-progress: true
+
 jobs:
-  build_for_pages:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
-    env:
-      GH_ACTION: true
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-node@v2
-      - name: Install and build.
-        run: |
-          npm install
-          npm run build
-      - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@v4
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'npm'
+      - name: Install dependencies
+        run: npm install
+      - name: Build
+        run: yarn run build
+      - name: Setup Pages
+        uses: actions/configure-pages@v3
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
         with:
-          folder: dist
+          # Upload dist repository
+          path: './dist'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1
diff --git a/babel.config.js b/babel.config.js
diff --git a/index.html b/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <link rel="icon" href="/favicon.ico" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>Unipept</title>
+    </head>
+
+    <body>
+        <div id="app"></div>
+        <script type="module" src="/src/main.ts"></script>
+    </body>
+</html>
diff --git a/jsconfig.json b/jsconfig.json
diff --git a/link_with_web_components.sh b/link_with_web_components.sh
@@ -13,7 +13,7 @@
 rm -rf ./node_modules/unipept-web-components/types/*
 
 # First remove the original dist data and link both together
-rm -f ./node_modules/unipept-web-components/dist/unipept-web-components.umd.min.js
+rm -f ./node_modules/unipept-web-components/dist/unipept-web-components.*
 
 # Then, start a watcher that automatically applies changes made to the original web components into our local copy
 # inside of node_modules