Fixed merge issues and associated type errors

.github/workflows/generateCheck.sh

@@ -1,14 +1,14 @@
-if [ $status == 0 ]; then
-	echo "## Formatting Check passed 🥳" >>$GITHUB_STEP_SUMMARY
-	echo "All files are formatted correctly" >>$GITHUB_STEP_SUMMARY
-	exit 0
+if [ $status == 'success' ]; then
+  echo "## Formatting Check passed 🥳" >>$GITHUB_STEP_SUMMARY
+  echo "All files are formatted correctly" >>$GITHUB_STEP_SUMMARY
+  exit 0
 else
-	echo "## Formatting Check Failed 😅" >>$GITHUB_STEP_SUMMARY
-	echo "Please run prettier using \`npx prettier . --write\` in order to format your code" >>$GITHUB_STEP_SUMMARY
-	echo "### Files with bad formatting:" >>$GITHUB_STEP_SUMMARY
-	for file in $files; do
-		echo "- $file" >>$GITHUB_STEP_SUMMARY
-		echo "::error file=$file::$file not formatted correctly"
-	done
-	exit 1
+  echo "## Formatting Check Failed 😅" >>$GITHUB_STEP_SUMMARY
+  echo "Please run prettier using \`npx prettier . --write\` in order to format your code" >>$GITHUB_STEP_SUMMARY
+  echo "### Files with bad formatting:" >>$GITHUB_STEP_SUMMARY
+  for file in $files; do
+    echo "- $file" >>$GITHUB_STEP_SUMMARY
+    echo "::error file=$file::$file not formatted correctly"
+  done
+  exit 1
 fi

.github/workflows/prettierCheck.yml

@@ -11,14 +11,14 @@ jobs:
           node-version: 18
           cache: 'npm'
       - name: Run npm install
-        run: |
-          mv package.json package.json.bak
-          npm i --no-save prettier prettier-plugin-tailwindcss
-          mv package.json.bak package.json
+        run: npm ci
       - name: Run prettier
+        id: prettier
+        continue-on-error: true
         run: |
-          files=`npx prettier . -l` || st=$? && st=$?
-          echo status=`echo $st`>>"$GITHUB_ENV"
-          echo files=`echo $files`>> "$GITHUB_ENV"
+          files=`npx prettier . -l` 
+          echo files=$files >> "$GITHUB_ENV"
       - name: generate errors/summary
         run: .github/workflows/generateCheck.sh
+        env:
+          status: ${{ steps.prettier.outcome }}

.prettierrc.mjs

@@ -0,0 +1,16 @@
+/**
+ * @see https://prettier.io/docs/en/configuration.html
+ * @type {import("prettier").Config}
+ */
+const config = {
+  printWidth: 80,
+  semi: true,
+  singleQuote: true,
+  tabWidth: 2,
+  trailingComma: 'all',
+  useTabs: false,
+  bracketSameLine: false,
+  plugins: ['prettier-plugin-tailwindcss'],
+};
+
+export default config;

README.md

@@ -104,7 +104,12 @@ $$;
 
 Currently, drizzle does not automatically create enums for you. You will have to create them manually. This [link](https://orm.drizzle.team/docs/column-types/pg#enum) should give you a good idea of how to create enums in postgres.
 
-</details> </br>
+</details> 
+<details>
+<summary>Tag View</summary>
+  there is a sql query in `src/server/db/tagView.sql` that you need to run in order for tags to work properly.
+  This query sets up a view that queries the different tags from clubs and orders them by how many clubs have those tags in descending order.
+</details></br>
 
 Once you have added the `DATABASE_URL` to your `.env` file, and have all the necessary extensions as well as enums, you will need to run the following commands to create the tables in your database.