Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JUP-86-Add Admin Tool #253

Closed
wants to merge 125 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
7f41568
extract searchparam into new hook
nl32 Feb 8, 2024
ab6c89e
fix typing for searchParams encoder
nl32 Feb 8, 2024
600aade
make event view setting client side and optimistic from search params
nl32 Feb 9, 2024
c75c947
fix: errors from malformated searchparams
nl32 Feb 9, 2024
897dc49
clean up filters
nl32 Feb 9, 2024
1147b95
add seperate schema for email contacts
nl32 Mar 8, 2024
d92234b
add seperate Contact button option for emails
nl32 Mar 9, 2024
5f2e016
update backend schema
nl32 Mar 17, 2024
c3be56f
Merge branch 'develop' into JUP-49-improve-contacts
nl32 Mar 17, 2024
b2136e9
remove list and grid toggle
nl32 Mar 23, 2024
8944929
Merge branch 'develop' into JUP-49-improve-contacts
nl32 Apr 1, 2024
ae8f6b9
extract contact schemas to new file and create seperate schemas for b…
nl32 Apr 1, 2024
bb8200d
fix edit contact form
nl32 Apr 1, 2024
8aaee17
Merge branch 'develop' into JUP-49-improve-contacts
RubenOlano Apr 2, 2024
0b658dc
Merge branch 'develop' into JUP-49-improve-contacts
nl32 Apr 3, 2024
1022dba
update instagram regex
nl32 Apr 3, 2024
9d6c4e7
Merge branch 'develop' into JUP-47-improve-events-page
nl32 Apr 3, 2024
f67e9fc
fix merge issue
nl32 Apr 3, 2024
f78cd5b
rework date selector
nl32 Apr 3, 2024
08d7dfb
rework eventFilter params
nl32 Apr 16, 2024
8e16020
improve datebrowser buttons
nl32 Apr 16, 2024
3530221
add server action to change date
nl32 Apr 16, 2024
e8d78bf
make eventtimealert client side and dynamic
nl32 Apr 16, 2024
275c8b1
update to next 14, no big changes
nl32 Apr 16, 2024
2cc3120
searchParams drilling, might change
nl32 Apr 16, 2024
366b466
move to server action for date change
nl32 Apr 16, 2024
7069c81
move sidebar to use server actions and add auto submit
nl32 Apr 18, 2024
dc14cfc
Merge branch 'develop' into JUP-47-improve-events-page
nl32 Apr 18, 2024
84f21ef
disable error its fine
nl32 Apr 18, 2024
4f08062
Merge branch 'develop' into JUP-49-improve-contacts
nl32 Apr 18, 2024
0dd002b
updated trpc?
nl32 Apr 18, 2024
1a82288
Merge branch 'develop' into JUP-47-improve-events-page
nl32 Apr 19, 2024
2bb2a06
Merge branch 'develop' into JUP-49-improve-contacts
nl32 Apr 19, 2024
142a98c
relocate server actions
nl32 Apr 19, 2024
a78f5a3
move setting filters back to client side
nl32 Apr 24, 2024
3712df3
fix lint issues
nl32 Apr 24, 2024
86f8492
Merge branch 'develop' into JUP-47-improve-events-page
nl32 Aug 19, 2024
7277d20
Merge branch 'develop' into JUP-47-improve-events-page
nl32 Aug 21, 2024
4829159
remove sidebar and improve styling for mobile
nl32 Aug 27, 2024
47635c4
change events page to use new findByDate endpoint
nl32 Aug 27, 2024
c13f559
Remove the event sidebar
nl32 Aug 27, 2024
b54d335
add CODEOWNERS
nl32 Aug 27, 2024
986b9c0
add engineering head
nl32 Aug 27, 2024
1ab87bb
Merge branch 'develop' into JUP-47-improve-events-page
nl32 Aug 27, 2024
049d853
Merge pull request #235 from UTDNebula/update-code-owners
nl32 Aug 27, 2024
d71c990
Merge pull request #225 from UTDNebula/JUP-47-improve-events-page
nl32 Aug 27, 2024
23801ba
switch tag query to use new tag view
nl32 Sep 3, 2024
525cf97
update read me to have new database setup instructions
nl32 Sep 3, 2024
38442d7
Update README.md
nl32 Sep 3, 2024
fad6591
event picture select grayed out; select start and end time by date only
BK2004 Sep 8, 2024
57d0945
end time defaults to start time when empty in TimeSelect
BK2004 Sep 8, 2024
5962921
Create API route returns event id; successful event creation redirect…
BK2004 Sep 8, 2024
518ef41
remove unused dependency
BK2004 Sep 8, 2024
7fd2d73
Update README.md
nl32 Sep 10, 2024
570b355
Merge pull request #237 from UTDNebula/JUP-84-tag-improvements
nl32 Sep 10, 2024
d91f446
start time updates end time to start time + one hour if needed; graye…
BK2004 Sep 20, 2024
8c41e9a
fixed build errors
BK2004 Sep 20, 2024
0358d1c
Merge remote-tracking branch 'origin/main' into JUP-78
BK2004 Sep 20, 2024
5f04037
Merge branch 'develop' into JUP-78
BK2004 Sep 20, 2024
95d6659
seperate different search bars
nl32 Sep 30, 2024
322ec20
relocate EventLikeButton
nl32 Sep 30, 2024
2d31a14
relocate sidebar/nav to own folder
nl32 Sep 30, 2024
07661b4
relocate ClubSelector
nl32 Sep 30, 2024
1b34d4c
relocate ProviderButtons since it's only used for sign in
nl32 Sep 30, 2024
bd87f30
relocate directory components and rename DirectoryOrgs
nl32 Sep 30, 2024
0d00a1e
colocate create club components
nl32 Sep 30, 2024
ac93254
relocate JoinButton for ClubCard
nl32 Sep 30, 2024
c1cdb46
colocate RegisterButton for event page
nl32 Sep 30, 2024
a1d3016
relocate carousel and return to top with other directory components
nl32 Sep 30, 2024
de580ea
relocate contact editor with contact edit form
nl32 Sep 30, 2024
a5014a8
relocate header components and back button
nl32 Sep 30, 2024
cc338db
move ContactIcons to icons folder
nl32 Sep 30, 2024
da3ca59
Merge pull request #238 from UTDNebula/JUP-78
nl32 Sep 30, 2024
db5daed
Merge branch 'develop' into component-reworks
nl32 Sep 30, 2024
1a8928e
fix broken imports
nl32 Sep 30, 2024
0656490
rename orgs to clubs in all locations
nl32 Oct 1, 2024
a46cb7a
fix relative icon imports
nl32 Oct 1, 2024
959f1ff
Merge pull request #240 from UTDNebula/component-reworks
nl32 Oct 1, 2024
3a422c1
add submit functionality to search bar
nl32 Oct 1, 2024
31df6a1
detailed commit message (oopsie)
CHarris0812 Oct 1, 2024
ea1284e
implement submits to current searchbars
nl32 Oct 1, 2024
1cabb03
added session stuff
CHarris0812 Oct 1, 2024
a1690d7
make vercel stop yelling at me hopefully
CHarris0812 Oct 1, 2024
2a65541
Updated the about page
Ninad-S Oct 1, 2024
3ccdaa9
make event countdown work
MamounE1 Oct 1, 2024
14cef9a
remove debug statement and reword logic
nl32 Oct 3, 2024
674959d
move prettier config to modules and add typing
nl32 Oct 3, 2024
c3a1532
fix formatting check
nl32 Oct 3, 2024
2b3468a
fix status check
nl32 Oct 3, 2024
37b81f7
fix substitution
nl32 Oct 3, 2024
4b1b983
simplify install
nl32 Oct 3, 2024
8fdeb9d
formatting fixes
nl32 Oct 3, 2024
f555151
fix passing check status
nl32 Oct 3, 2024
eae9bf3
Merge pull request #246 from UTDNebula/prettier-changes
nl32 Oct 3, 2024
906cc94
Merge branch 'develop' into search-bar-submit
nl32 Oct 3, 2024
eca5322
Merge pull request #241 from UTDNebula/search-bar-submit
nl32 Oct 3, 2024
5e86d36
Merge branch 'develop' into JUP-58-countdown
nl32 Oct 3, 2024
54fce07
fix status output
nl32 Oct 3, 2024
62d3430
Merge pull request #247 from UTDNebula/format-fix
nl32 Oct 3, 2024
846c57d
Merge branch 'develop' into JUP-58-countdown
nl32 Oct 3, 2024
090abc1
Fix Import on about page
nl32 Oct 8, 2024
b7a9e23
formatting fixes
nl32 Oct 8, 2024
d30664e
Add Google Analytics
TyHil Oct 8, 2024
64b41d6
Remove Vercel Analytics
TyHil Oct 8, 2024
1785cc4
Use @next/third-parties
TyHil Oct 8, 2024
cebe3dd
Merge pull request #248 from UTDNebula/google-analytics
nl32 Oct 8, 2024
0fa39ba
Fixed the suggesions
MamounE1 Oct 8, 2024
0c485c3
fix format check output (#249)
nl32 Oct 14, 2024
2359f0a
fixed merge conflicts
CHarris0812 Oct 22, 2024
874f19d
Merge branch 'develop' into JUP-58-countdown
nl32 Oct 22, 2024
70d5cb8
fix formatting
nl32 Oct 22, 2024
91d7678
Merge pull request #243 from UTDNebula/JUP-58-countdown
nl32 Oct 22, 2024
f50bf79
Merge branch 'develop' into JUP-61-club-search-page
nl32 Oct 22, 2024
9ab979c
i h8 vercel
CHarris0812 Oct 22, 2024
a960123
Merge branch 'JUP-61-club-search-page' of https://github.com/UTDNebul…
CHarris0812 Oct 22, 2024
21c5895
move routes
nl32 Oct 22, 2024
fe58b65
Merge pull request #244 from UTDNebula/JUP-61-club-search-page
nl32 Oct 22, 2024
fdbccd0
Merge branch 'develop' into JUP-49-improve-contacts
nl32 Oct 22, 2024
2f12c58
remove regex
nl32 Oct 22, 2024
aec08ba
Merge pull request #217 from UTDNebula/JUP-49-improve-contacts
nl32 Oct 22, 2024
fb86d5a
Merge branch 'develop' into JUP-88-Update-About-Page
nl32 Oct 22, 2024
976a761
Merge pull request #242 from UTDNebula/JUP-88-Update-About-Page
nl32 Oct 22, 2024
7923b46
made it so that no search results found is displayed when applicable
CHarris0812 Oct 22, 2024
2a1746d
ran prettier on the code
CHarris0812 Oct 22, 2024
1e7f939
Merge pull request #251 from UTDNebula/club-search-no-results
nl32 Oct 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions .github/workflows/generateCheck.sh
Original file line number Diff line number Diff line change
@@ -1,14 +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
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
12 changes: 2 additions & 10 deletions .github/workflows/prettierCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,6 @@ 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
- name: Run prettier
run: |
files=`npx prettier . -l` || st=$? && st=$?
echo status=`echo $st`>>"$GITHUB_ENV"
echo files=`echo $files`>> "$GITHUB_ENV"
- name: generate errors/summary
run: npm ci
- name: Run prettier & generate problems
run: .github/workflows/generateCheck.sh
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;
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