Skip to content

Commit

Permalink
Merge branch 'develop' into JUP-49-improve-contacts
Browse files Browse the repository at this point in the history
  • Loading branch information
nl32 committed Oct 22, 2024
2 parents 2bb2a06 + fe58b65 commit fdbccd0
Show file tree
Hide file tree
Showing 118 changed files with 2,743 additions and 1,449 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/generateCheck.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
files=$(npx prettier . -l)
status=$?
if [ $status == 0 ]; 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
fi
16 changes: 16 additions & 0 deletions .github/workflows/prettierCheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Formatting Check
run-name: Running formatting check
on: [push]
jobs:
check-formatting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
cache: 'npm'
- name: Run npm install
run: npm ci
- name: Run prettier & generate problems
run: .github/workflows/generateCheck.sh
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/server/db/migrations/*
9 changes: 0 additions & 9 deletions .prettierrc.js

This file was deleted.

16 changes: 16 additions & 0 deletions .prettierrc.mjs
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 2 additions & 0 deletions CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# for now project lead or engineering head should signoff on any prs
* @nl32 @KennethImphean
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Loading

0 comments on commit fdbccd0

Please sign in to comment.