Merge branch 'colorstackorg:main' into birthdayChange2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug Report 🐞
 about: Report any issues with the platform.
 title: ''
-labels: bug
+labels: Bug 🐞
 assignees: ''
 ---
 

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,7 @@
 contact_links:
-  - name: Ask a Question ❓
-    url: https://colorstack-family.slack.com/channels/C06S0DBFD6X
-    about: Need help on something? Feedback on a feature idea? Ask in our Slack!
+  - name: Feature Request 🚀
+    url: https://github.com/colorstackorg/oyster/discussions/new?category=ideas
+    about: We use GitHub Discussions to propose and discuss new ideas. 💬
+  - name: Get Help 🙏
+    url: https://github.com/colorstackorg/oyster/discussions/new?category=help
+    about: Need help on something? Ask a question to other community members!

.github/ISSUE_TEMPLATE/general.md

@@ -1,6 +1,6 @@
 ---
 name: General 📤
-about: A generic ticket.
+about: For admin use only.
 title: ''
 labels:
 assignees: ''

.github/workflows/auto-author-assign.yml

@@ -0,0 +1,14 @@
+name: Auto Author Assign
+
+on:
+  pull_request_target:
+    types: [opened, reopened]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  assign-author:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: toshimaru/[email protected]

.gitignore

@@ -39,3 +39,7 @@ yarn-error.log*
 # Miscelleanous
 
 .DS_Store
+
+# Other
+
+schema.prisma

.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+  "recommendations": [
+    "formulahendry.auto-rename-tag",
+    "dbaeumer.vscode-eslint",
+    "MS-vsliveshare.vsliveshare",
+    "esbenp.prettier-vscode",
+    "bradlc.vscode-tailwindcss",
+    "EditorConfig.EditorConfig"
+  ]
+}

.vscode/settings.json

@@ -9,7 +9,6 @@
   "eslint.workingDirectories": ["./apps/*", "./config/*", "./packages/*"],
   "typescript.tsdk": "node_modules/typescript/lib",
   "typescript.preferences.importModuleSpecifier": "non-relative",
-  "typescript.preferGoToSourceDefinition": true,
   "tailwindCSS.experimental.configFile": "./config/tailwind/tailwind.config.js",
   "tailwindCSS.experimental.classRegex": [
     ["cx\\(([^)]+)\\)", "'([^']*)'"],

CONTRIBUTING.md

@@ -25,6 +25,8 @@ ColorStack members first, and then friends of ColorStack. ❤️
     - [Postgres Setup](#postgres-setup)
     - [Executing Database Migrations](#executing-database-migrations)
     - [Seeding the Database](#seeding-the-database)
+    - [Stopping the Database](#stopping-the-database)
+    - [Using a Database GUI (Prisma Studio)](#using-a-database-gui-prisma-studio)
   - [Building the Project](#building-the-project)
   - [Running the Applications](#running-the-applications)
   - [Logging Into Applications](#logging-into-applications)
@@ -33,6 +35,7 @@ ColorStack members first, and then friends of ColorStack. ❤️
 - [Making a Pull Request](#making-a-pull-request)
   - [Your First PR](#your-first-pr)
 - [Deciding What to Work On](#deciding-what-to-work-on)
+  - [Proposing Ideas](#proposing-ideas)
 - [License](#license)
 
 ## Local Development
@@ -59,6 +62,13 @@ which will automatically install the right node version for any given directory
 that you're working in, as long as there is a [`.nvmrc`](./.nvmrc) file found in
 that directory.
 
+If you don't want to set up a shell integration, you can switch to the
+appropriate Node version manually by doing:
+
+```sh
+nvm install && nvm use
+```
+
 ### Fork and Clone Repository
 
 1. [Fork the repository](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo)
@@ -125,15 +135,6 @@ To execute the database migrations, run:
 yarn db:migrate
 ```
 
-To verify that the migration was executed successfully, connect to your Postgres
-database and run:
-
-```sh
-\d
-```
-
-You should see a bunch of SQL tables!
-
 #### Seeding the Database
 
 Now that we have some tables, we're ready to add some seed data in our database,
@@ -146,6 +147,34 @@ yarn db:seed
 Follow the prompt to add your email, and you will now be able to log into both
 applications.
 
+#### Stopping the Database
+
+Once you are done developing, you might want to stop the database containers
+from running. Keeping your containers up can eat up your battery life, so it's
+recommended to take them down once you are done using them. Run:
+
+```
+yarn dx:down
+```
+
+#### Using a Database GUI (Prisma Studio)
+
+To make it easier to interact with and manage your data in the browser, you can
+use [Prisma Studio](https://www.prisma.io/studio)!
+
+To get started, setup your Prisma schema file by running:
+
+```
+yarn prisma:setup
+```
+
+Then, start Prisma Studio locally and open your browser to the URL that gets
+printed:
+
+```
+yarn prisma:studio
+```
+
 ### Building the Project
 
 You can build the project by running:
@@ -253,10 +282,17 @@ chore: my first contribution ❤️
 ## Deciding What to Work On
 
 You can start by browsing through our list of
-[issues](https://github.com/colorstackorg/oyster/issues) or creating your own
-issue that would improve our product. Once you've decided on an issue, leave a
-comment and wait to get approval from one of our codebase admins - this helps
-avoid multiple people working on this same issue.
+[issues](https://github.com/colorstackorg/oyster/issues). Once you've decided on
+an issue, leave a comment and wait to get approval from one of our codebase
+admins - this helps avoid multiple people working on this same issue.
+
+### Proposing Ideas
+
+If you have a feature request or idea that would improve our product, please
+start a discussion in our
+[GitHub Discussions](https://github.com/colorstackorg/oyster/discussions) space!
+If the maintainers see value in the idea, they will create issue from that
+discussion.
 
 ## License
 

CONTRIBUTORS.yml

@@ -10,4 +10,27 @@
 - Joyeleke
 - Boris713
 - svntii
-- vazquezea96
+- vazquezea96
+- aarontorres0
+- demekenega
+- israelali1424
+- levin0710
+- RiosNicholas
+- ayoaru
+- beteabtefera
+- reaganrazon
+- jehron
+- nyccreator
+- donchuru
+- ashleyjagai
+- Wisesofthemall
+- kkellybonilla
+- ciaracade
+- arelymartinez16
+- efloresz
+- lianarosa
+- nicholasg2001
+- nayoseph
+- savazques
+- Lumiho
+- iperalta7

README.md

@@ -106,3 +106,11 @@ list on what we can configure, see
 ## Contributing
 
 Please see our [contributing guide](./CONTRIBUTING.md)! 👋
+
+A heartfelt thanks to our ColorStack members for their contributions! 🙏
+
+<a href="https://github.com/colorstackorg/oyster/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=colorstackorg/oyster" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).

apps/admin-dashboard/.env.example

@@ -5,14 +5,22 @@ API_URL=http://localhost:8080
 DATABASE_URL=postgresql://oyster:oyster@localhost:5433/oyster
 ENVIRONMENT=development
 JWT_SECRET=_
+MEMBER_PROFILE_URL=http://localhost:3000
 REDIS_URL=redis://localhost:6380
 SESSION_SECRET=_
 
 # Optional for development, but won't be able to run certain features...
 
+# AIRTABLE_API_KEY=
+# AIRTABLE_FAMILY_BASE_ID=
+# AIRTABLE_MEMBERS_TABLE_ID=
+# AIRTABLE_RESUME_BOOKS_BASE_ID=
+# GITHUB_TOKEN=
 # GOOGLE_CLIENT_ID=
+# GOOGLE_CLIENT_SECRET=
+# GOOGLE_DRIVE_RESUME_BOOKS_FOLDER_ID=
 # POSTMARK_API_TOKEN=
 # SENTRY_DSN=
 # SMTP_HOST=
 # SMTP_PASSWORD=
-# SMTP_USERNAME=
+# SMTP_USERNAME=

apps/admin-dashboard/.eslintrc.cjs

@@ -4,4 +4,7 @@ module.exports = {
   parserOptions: {
     tsconfigRootDir: __dirname,
   },
+  rules: {
+    'no-restricted-imports': ['error', { patterns: ['./*', '../*'] }],
+  },
 };

apps/admin-dashboard/app/entry.server.tsx

@@ -3,6 +3,7 @@ import { createReadableStreamFromReadable } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
 import * as Sentry from '@sentry/remix';
 import dayjs from 'dayjs';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
 import timezone from 'dayjs/plugin/timezone.js';
 import utc from 'dayjs/plugin/utc.js';
 import isbot from 'isbot';
@@ -14,10 +15,11 @@ import { getCookie } from '@oyster/utils';
 // Importing this file ensures that our application has all of the environment
 // variables necessary to run. If any are missing, this file will throw an error
 // and crash the application.
-import { ENV } from './shared/constants.server';
+import { ENV } from '@/shared/constants.server';
 
 dayjs.extend(utc);
 dayjs.extend(timezone);
+dayjs.extend(advancedFormat);
 
 Sentry.init({
   dsn: ENV.SENTRY_DSN,

apps/admin-dashboard/app/root.tsx

@@ -10,12 +10,13 @@ import {
 } from '@remix-run/react';
 import { withSentry } from '@sentry/remix';
 
+import { buildMeta } from '@oyster/core/remix';
 import { Toast } from '@oyster/ui';
 import uiStylesheet from '@oyster/ui/index.css?url';
 
-import { ENV } from './shared/constants.server';
-import { commitSession, getSession, SESSION } from './shared/session.server';
-import tailwindStylesheet from './tailwind.css?url';
+import { ENV } from '@/shared/constants.server';
+import { commitSession, getSession, SESSION } from '@/shared/session.server';
+import tailwindStylesheet from '@/tailwind.css?url';
 
 export const links: LinksFunction = () => {
   return [
@@ -25,7 +26,10 @@ export const links: LinksFunction = () => {
 };
 
 export const meta: MetaFunction = () => {
-  return [{ title: 'ColorStack | Admin Dashboard' }];
+  return buildMeta({
+    description: `Your home for all things ColorStack administration. Manage applications, events and more!`,
+    title: 'Admin Dashboard',
+  });
 };
 
 export async function loader({ request }: LoaderFunctionArgs) {

apps/admin-dashboard/app/routes/_dashboard._index.tsx

@@ -1,10 +1,10 @@
 import { type LoaderFunctionArgs, redirect } from '@remix-run/node';
 
-import { Route } from '../shared/constants';
-import { getSession } from '../shared/session.server';
+import { Route } from '@/shared/constants';
+import { getSession } from '@/shared/session.server';
 
 export async function loader({ request }: LoaderFunctionArgs) {
   await getSession(request);
 
-  return redirect(Route.APPLICATIONS);
+  return redirect(Route['/applications']);
 }