Merge remote-tracking branch 'origin/main' into vs-code-integration

clicepfl · May 25, 2023 · df119b9 · df119b9
2 parents 607ef8c + 912d8e4
commit df119b9
Show file tree

Hide file tree

Showing 15 changed files with 303 additions and 302 deletions.
diff --git a/.devcontainer/docker-compose.yaml b/.devcontainer/docker-compose.yaml
@@ -4,7 +4,6 @@
 name: clic-website-devcontainer
 
 services:
-
   # Custom strapi service
   strapi:
     # Build the strapi service from its folder
@@ -48,4 +47,4 @@ services:
 
 volumes:
   # Persist strapi database
-  strapi-data:
+  strapi-data:
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,6 @@
+**/.git
+**/.svn
+**/.hg
+**/node_modules
+**/dist
+**/.cache
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,56 +1,56 @@
 {
-    /*
-     * Base VSCode settings
-     */
-    "editor.codeActionsOnSave": {
-        "source.organizeImports": true
-    },
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.formatOnPaste": true,
-    "editor.formatOnSave": true,
-    /*
-     * Extension settings
-     * wayou.vscode-todo-highlight
-     */
-    "todohighlight.defaultStyle": {
-        "color": "white",
-        "backgroundColor": "orange"
-    },
-    "todohighlight.keywordsPattern": "(todo|TODO|fixme|FIXME)(:?)",
-    "terminal.integrated.profiles.linux": {
-      "strapi": {
-        "path": "docker",
-        "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
-        "overrideName": true
-      }, 
-      "postgres": {
-        "path": "docker",
-        "args": ["exec", "-it", "clic-postgres", "/bin/bash"],
-        "overrideName": true
-      }
+  /*
+   * Base VSCode settings
+   */
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": true
+  },
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnPaste": true,
+  "editor.formatOnSave": true,
+  /*
+   * Extension settings
+   * wayou.vscode-todo-highlight
+   */
+  "todohighlight.defaultStyle": {
+    "color": "white",
+    "backgroundColor": "orange"
+  },
+  "todohighlight.keywordsPattern": "(todo|TODO|fixme|FIXME)(:?)",
+  "terminal.integrated.profiles.linux": {
+    "strapi": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
+      "overrideName": true
     },
-    "terminal.integrated.profiles.windows": {
-      "strapi": {
-        "path": "docker",
-        "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
-        "overrideName": true
-      }, 
-      "postgres": {
-        "path": "docker",
-        "args": ["exec", "-it", "clic-postgres", "/bin/bash"],
-        "overrideName": true
-      }
+    "postgres": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-postgres", "/bin/bash"],
+      "overrideName": true
+    }
+  },
+  "terminal.integrated.profiles.windows": {
+    "strapi": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
+      "overrideName": true
     },
-    "terminal.integrated.profiles.osx": {
-      "strapi": {
+    "postgres": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-postgres", "/bin/bash"],
+      "overrideName": true
+    }
+  },
+  "terminal.integrated.profiles.osx": {
+    "strapi": {
       "path": "docker",
       "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
-        "overrideName": true
-    }, 
-      "postgres": {
-        "path": "docker",
-        "args": ["exec", "-it", "clic-postgres", "/bin/bash"],
-        "overrideName": true
-      }
+      "overrideName": true
+    },
+    "postgres": {
+      "path": "docker",
+      "args": ["exec", "-it", "clic-postgres", "/bin/bash"],
+      "overrideName": true
+    }
   }
-}
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,32 +1,34 @@
 {
-	"version": "2.0.0",
-	"tasks": [{
-		"label": "Start dev container",
-		"type": "shell",
-		"command": "docker compose --file .devcontainer/docker-compose.yaml up",
-		"windows": {
-		  "command": "docker compose --file .devcontainer\\docker-compose.yaml up"
-		},
-		"group": "none",
-		"presentation": {
-		  "reveal": "always",
-		  "panel": "new"
-		},
-		"runOptions": {
-		  "runOn": "folderOpen"
-		}
-	  }, {
-		"label": "Stop dev container",
-		"type": "shell",
-		"command": "docker compose --file .devcontainer/docker-compose.yaml down",
-		"windows": {
-		  "command": "docker compose --file .devcontainer\\docker-compose.yaml down"
-		},
-		"group": "none",
-		"presentation": {
-		  "reveal": "always",
-		  "panel": "new"
-		}
-	  }
-	]
-}
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Start dev container",
+      "type": "shell",
+      "command": "docker compose --file .devcontainer/docker-compose.yaml up",
+      "windows": {
+        "command": "docker compose --file .devcontainer\\docker-compose.yaml up"
+      },
+      "group": "none",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "runOptions": {
+        "runOn": "folderOpen"
+      }
+    },
+    {
+      "label": "Stop dev container",
+      "type": "shell",
+      "command": "docker compose --file .devcontainer/docker-compose.yaml down",
+      "windows": {
+        "command": "docker compose --file .devcontainer\\docker-compose.yaml down"
+      },
+      "group": "none",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      }
+    }
+  ]
+}