diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..b3284a90 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,6 @@ +# These owners will be the default owners for everything in +# the repo. Unless a later match takes precedence, +# they will will be requested for +# review when someone opens a pull request. + +* @emmebravo @DevinCLane @alcpereira @moses-codes @funbunch @merrua @intelagense diff --git a/.github/assets/development-push-force-with-lease.jpg b/.github/assets/development-push-force-with-lease.jpg new file mode 100644 index 00000000..c4a99f08 Binary files /dev/null and b/.github/assets/development-push-force-with-lease.jpg differ diff --git a/.github/assets/development-source-control-button.jpg b/.github/assets/development-source-control-button.jpg new file mode 100644 index 00000000..79fb0d9d Binary files /dev/null and b/.github/assets/development-source-control-button.jpg differ diff --git a/.github/workflows/fly-deploy.yml b/.github/workflows/fly-deploy.yml new file mode 100644 index 00000000..f5d37d71 --- /dev/null +++ b/.github/workflows/fly-deploy.yml @@ -0,0 +1,25 @@ +name: Deploy to Fly.io + +on: + push: + branches: + - main + +jobs: + deploy: + name: Deploy App + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Fly.io CLI + uses: superfly/flyctl-actions/setup-flyctl@v1 + with: + version: 0.3.155 + + - name: Deploy to Fly.io + env: + FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }} + run: flyctl deploy --remote-only diff --git a/.prettierignore b/.prettierignore index 736e6e9e..116c3dab 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ build .nyc_output coverage +CODEOWNERS \ No newline at end of file diff --git a/README.md b/README.md index 4b6f23f6..63f4af48 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,4 @@
- - - Discord @@ -31,9 +28,9 @@ what's going on in the 100Devs community!

- Project Wiki + Project Docs · - Contributing guide + Contributing guide · Link to project · @@ -75,7 +72,7 @@ # 📢 About -Together is a new app designed for 100devs. Together is a group calendar for public events, so you can see what's going on in your community. We're making it easier to find out about the events that are happening in Discord and let you know how much fun they'll be! +Together is a new app designed for 100Devs. Together is a group calendar for public events, so you can see what's going on in your community. We're making it easier to find out about the events that are happening in Discord and let you know how much fun they'll be!
@@ -119,10 +116,10 @@ Together is a new app designed for 100devs. Together is a group calendar for pub ## 💻 Install -- Read up on our [New Developer Onboarding](https://github.com/Together-100Devs/Together/wiki/02---Onboarding) in the wiki. +- Read up on our [New Developer Onboarding](https://github.com/Together-100Devs/Together/tree/main/docs/02-Onboarding.md) in the docs. - Fork and clone the repository to your local computer. - Complete and store `.env` file in the `server/` folder - - [(See .env template setup instructions)](https://github.com/Together-100Devs/Together/wiki/02---Onboarding#development-machine-setup) + - [(See .env template setup instructions)](https://github.com/Together-100Devs/Together/tree/main/docs/02-Onboarding.md#development-machine-setup) - `npm install` in the root folder. installs the required dependencies. - `npm run dev` in the root folder. This starts the front-end and back-end in one terminal. - This runs a local instance of mongodb. You can connect to it by connecting to `mongodb://127.0.0.1:27017/` with any MongoDB client like [Compass](https://www.mongodb.com/products/compass). @@ -155,17 +152,24 @@ We highly encourage you to ask questions and join the discussion in the [Togethe ## Help us improve Together! -Together is a community-driven open source project backed by 100devs students. Whether you are helping us fixing bugs, proposing new feature, improving our documentation or spreading the word - All contributions are welcome. +Together is a community-driven open source project backed by 100Devs students. Whether you are helping us fixing bugs, proposing new feature, improving our documentation or spreading the word - All contributions are welcome.
If you're interested in contributing, you may: -- Read our [Contributing guide.](https://github.com/Together-100Devs/Together/wiki/04-Contributing) +- Read our [Contributing guide.](https://github.com/Together-100Devs/Together/tree/main/docs/04-Contributing.md) - Join the [#Together thread](https://discord.com/channels/735923219315425401/1038482732633825442) within the 100Devs Discord to discuss your ideas. - Visit the [Issues tab](https://github.com/Together-100Devs/Together/issues) to request an issue or to open a new issue. - You can also convert a "draft todo" to an issue on the current [Project Board.](https://github.com/Together-100Devs/Together/projects?query=is%3Aopen) +## Contributing Guidelines (abbrieviated) + +1. Comment on an issue you'd like to work on. +2. Wait to be assigned that issue on GitHub +3. Once you are assigned, you are cleared to work on that issue. +4. Proceed by following the Contributing Guidelines +

(back to top)

diff --git a/client/package.json b/client/package.json index 52f06103..deb22876 100644 --- a/client/package.json +++ b/client/package.json @@ -2,7 +2,7 @@ "name": "client", "description": "Client for Together App", "main": "src/index.jsx", - "author": "100devs", + "author": "100Devs", "type": "module", "scripts": { "start": "vite", @@ -20,14 +20,12 @@ }, "devDependencies": { "@storybook/react-vite": "^9.0.12", + "@tailwindcss/vite": "^4.1.10", "@vitejs/plugin-react": "^4.4.1", - "autoprefixer": "^10.4.13", "axios": "^1.1.3", - "http-proxy-middleware": "^2.0.6", - "postcss": "^8.4.18", "prop-types": "^15.8.1", "storybook": "^9.0.12", - "tailwindcss": "^3.2.2", + "tailwindcss": "^4.1.10", "vite": "^6.3.5", "vite-plugin-istanbul": "^7.0.0" }, diff --git a/client/postcss.config.cjs b/client/postcss.config.cjs deleted file mode 100644 index 12a703d9..00000000 --- a/client/postcss.config.cjs +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - plugins: { - tailwindcss: {}, - autoprefixer: {}, - }, -}; diff --git a/client/src/features/adminDashboard/EventCard.jsx b/client/src/features/adminDashboard/EventCard.jsx index eedb2378..c58e6327 100644 --- a/client/src/features/adminDashboard/EventCard.jsx +++ b/client/src/features/adminDashboard/EventCard.jsx @@ -8,7 +8,7 @@ function EventCard({ event }) {
  • {event.title}
    • -
  • {event.description}
    • +
  • {event.description}
  • Scheduled by: {event.user?.displayName || "UNKNOWN"}
    • diff --git a/client/src/features/auth/LoginWithDiscord.jsx b/client/src/features/auth/LoginWithDiscord.jsx index 9fa338a9..a7d2332b 100644 --- a/client/src/features/auth/LoginWithDiscord.jsx +++ b/client/src/features/auth/LoginWithDiscord.jsx @@ -12,7 +12,7 @@ const LoginWithDiscord = ({ DiscordIcon }) => { type="submit" >
    -
    +
    Login with Discord
    @@ -29,7 +29,7 @@ const LoginWithDiscord = ({ DiscordIcon }) => { className="flex items-center justify-center tracking-widest gap-3" >
    -
    +
    Logout
    diff --git a/client/src/features/calendar/Calendar.jsx b/client/src/features/calendar/Calendar.jsx index f4109fb4..491fb9bc 100644 --- a/client/src/features/calendar/Calendar.jsx +++ b/client/src/features/calendar/Calendar.jsx @@ -69,14 +69,14 @@ const Calendar = ({ date }) => { // while we are loading events, add the "animate-pulse" class to show skeleteon loading effect let classNames = - "flex flex-grow h-full w-full overflow-auto text-gray-700 bg-white"; + "flex grow h-full w-full overflow-auto text-gray-700 bg-white"; if (status === Status.LOADING) { classNames += " animate-pulse"; } return (
    -
    +
    {/* render error message if there was an error fetching data */} {status === Status.REJECTED &&
    {error}
    } diff --git a/client/src/features/calendar/DayCard.jsx b/client/src/features/calendar/DayCard.jsx index 0428d945..40514c3f 100644 --- a/client/src/features/calendar/DayCard.jsx +++ b/client/src/features/calendar/DayCard.jsx @@ -46,7 +46,7 @@ const DayCard = ({ date, events }) => {
    {isFutureOrToday && ( // Only render the button if the date is >= current day diff --git a/client/src/features/calendar/MonthAndYear.jsx b/client/src/features/calendar/MonthAndYear.jsx index 8c9ad332..716994b6 100644 --- a/client/src/features/calendar/MonthAndYear.jsx +++ b/client/src/features/calendar/MonthAndYear.jsx @@ -7,7 +7,10 @@ const MonthAndYear = ({ return (
    - -
    -

    +

    {month}, {year}

    diff --git a/client/src/features/calendarHeader/CalendarHeader.jsx b/client/src/features/calendarHeader/CalendarHeader.jsx index ef56504e..ee88dc14 100644 --- a/client/src/features/calendarHeader/CalendarHeader.jsx +++ b/client/src/features/calendarHeader/CalendarHeader.jsx @@ -49,7 +49,7 @@ function CalendarHeader({ date }) { onClick={() => navigate("/")} /> -
    +
    Logo diff --git a/client/src/features/calendarHeader/components/TodayButton.jsx b/client/src/features/calendarHeader/components/TodayButton.jsx index 9060973d..85010db7 100644 --- a/client/src/features/calendarHeader/components/TodayButton.jsx +++ b/client/src/features/calendarHeader/components/TodayButton.jsx @@ -1,7 +1,7 @@ function TodayButton({ text, tooltipText, ...rest }) { return (