Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -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
25 changes: 25 additions & 0 deletions .github/workflows/fly-deploy.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
build
.nyc_output
coverage
CODEOWNERS
21 changes: 14 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
what's going on in the 100Devs community!
<br/>
<br/>
<a href="https://github.com/Together-100Devs/Together/wiki">Project Wiki</a>
<a href="https://github.com/Together-100Devs/Together/tree/main/docs/01-Team-Organization.md">Project Docs</a>
·
<a href="https://github.com/Together-100Devs/Together/wiki/04-Contributing">Contributing guide</a>
<a href="https://github.com/Together-100Devs/Together/tree/main/docs/04-Contributing.md">Contributing guide</a>
·
<a href="https://together.rocks/"><strong>Link to project</strong></a>
·
Expand Down Expand Up @@ -75,7 +75,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!

<br/>

Expand Down Expand Up @@ -119,10 +119,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).
Expand Down Expand Up @@ -155,17 +155,24 @@ We highly encourage you to ask questions and join the discussion in the [Togethe

## Help us improve Together!

<em>Together</em> 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 - <strong>All contributions are welcome.</strong>
<em>Together</em> 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 - <strong>All contributions are welcome.</strong>

<br>

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 <a href="https://github.com/Together-100Devs/Together/issues">issue</a> 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

<p align="right">(<a href="#top">back to top</a>)</p>

<div align='center'>
Expand Down
3 changes: 1 addition & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "client",
"description": "Client for Together App",
"main": "src/index.jsx",
"author": "100devs",
"author": "100Devs",
"type": "module",
"scripts": {
"start": "vite",
Expand All @@ -23,7 +23,6 @@
"@tailwindcss/vite": "^4.1.10",
"@vitejs/plugin-react": "^4.4.1",
"axios": "^1.1.3",
"http-proxy-middleware": "^2.0.6",
"prop-types": "^15.8.1",
"storybook": "^9.0.12",
"tailwindcss": "^4.1.10",
Expand Down
4 changes: 2 additions & 2 deletions client/src/features/auth/LoginWithDiscord.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const LoginWithDiscord = ({ DiscordIcon }) => {
type="submit"
>
<div className="flex border-2 border-slate-400 bg-white rounded-2xl">
<div className="flex flex-row space-x-3 py-3 px-8 m-3 bg-discord-btn rounded-lg font-bold">
<div className="flex flex-row space-x-3 py-3 px-8 m-3 bg-discord-btn rounded-lg font-bold cursor-pointer">
<DiscordIcon className="w-7 h-7" />
<span>Login with Discord</span>
</div>
Expand All @@ -29,7 +29,7 @@ const LoginWithDiscord = ({ DiscordIcon }) => {
className="flex items-center justify-center tracking-widest gap-3"
>
<div className="flex border-2 border-slate-400 bg-white rounded-2xl">
<div className="py-3 px-8 m-3 bg-discord-btn rounded-lg font-bold">
<div className="py-3 px-8 m-3 bg-discord-btn rounded-lg font-bold cursor-pointer">
Logout
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/src/features/calendar/DayCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const DayCard = ({ date, events }) => {
</div>
{isFutureOrToday && ( // Only render the button if the date is >= current day
<button
className="absolute bottom-0 right-0 items-center justify-center hidden w-6 h-6 mb-2 mr-2 text-white bg-gray-400 rounded-sm group-hover:flex hover:bg-gray-500"
className="absolute bottom-0 right-0 items-center justify-center hidden w-6 h-6 mb-2 mr-2 text-white bg-gray-400 rounded-sm group-hover:flex hover:bg-gray-500 cursor-pointer"
onClick={() => {
let chosenDate = `${date.getFullYear()}-${(date.getMonth() + 1)
.toString()
Expand Down
13 changes: 10 additions & 3 deletions client/src/features/calendar/MonthAndYear.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ const MonthAndYear = ({
return (
<div className="flex items-center">
<div className="flex">
<button onClick={handlePreviousMonth}>
<button
onClick={handlePreviousMonth}
className="hover:scale-110 hover:text-blue-500 transition-transform duration-200 cursor-pointer"
>
<svg
className="w-6 h-6 max-[440px]:w-4 max-[440px]:h-4"
xmlns="http://www.w3.org/2000/svg"
Expand All @@ -23,7 +26,11 @@ const MonthAndYear = ({
/>
</svg>
</button>
<button data-cy="next-month" onClick={handleNextMonth}>
<button
data-cy="next-month"
onClick={handleNextMonth}
className="hover:scale-110 hover:text-blue-500 transition-transform duration-200 cursor-pointer"
>
<svg
className="w-6 h-6 max-[440px]:w-4 max-[440px]:h-4"
xmlns="http://www.w3.org/2000/svg"
Expand All @@ -40,7 +47,7 @@ const MonthAndYear = ({
</svg>
</button>
</div>
<h2 className="max-[440px]:ml-1 ml-2 w-[14ch] max-[440px]:text-base max-[440px]:text-center sm:text-3xl text-xl font-bold leading-none">
<h2 className="max-[440px]:ml-1 ml-2 w-[14ch] max-[440px]:text-base sm:text-3xl text-xl font-bold leading-none text-center">
{month}, {year}
</h2>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function HeaderButton({ Icon, tooltipText, ...rest }) {
return (
<button
className="p-2 sm:p-3 relative bg-[#F5E7DE] shadow-[0_4px_4px_0_rgba(0,0,0,0.25)] rounded-lg group font-inconsolata font-bold"
className="p-2 sm:p-3 relative bg-[#F5E7DE] shadow-[0_4px_4px_0_rgba(0,0,0,0.25)] rounded-lg group font-inconsolata font-bold cursor-pointer"
{...rest}
>
<Icon className="max-[380px]:w-4 max-[380px]:h-4 w-6 h-6 sm:w-8 sm:h-8 text-[#C57756]" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function TodayButton({ text, tooltipText, ...rest }) {
return (
<button
className="relative sm:p-2 sm:px-4 p-1 px-3 bg-teal-light shadow-[0_4px_4px_0_rgba(0,0,0,0.25)] rounded-lg font-inconsolata font-bold"
className="relative sm:p-2 sm:px-4 p-1 px-3 bg-teal-light shadow-[0_4px_4px_0_rgba(0,0,0,0.25)] rounded-lg font-inconsolata font-bold cursor-pointer"
{...rest}
>
<span className="text-lg font-bold max-[440px]:text-sm">{text}</span>
Expand Down
2 changes: 1 addition & 1 deletion client/src/features/form/FormConfirm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default function FormConfirm() {
</div>
</div>
<div className=" mx-7 ">
<div className=" flex space-x-4 items-center">
<div className="flex space-x-4 items-center">
<input
type="checkbox"
value="1"
Expand Down
2 changes: 1 addition & 1 deletion client/src/features/form/UserForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const UserForm = () => {
<div className="container horizontal mt-5">
<div className="flex flex-col items-center">
<button
className="w-auto h-12 mt-5 px-2 border-solid border-2 border-gray outline-hidden rounded-sm font-semibold text-xl hover:bg-teal-600 active:bg-teal-700 focus:outline-hidden focus:ring-3 focus:ring-teal-300"
className="w-auto h-12 mt-5 px-2 border-solid border-2 border-gray outline-hidden rounded-sm font-semibold text-xl hover:bg-teal-600 active:bg-teal-700 focus:outline-hidden focus:ring-3 focus:ring-teal-300 cursor-pointer"
onClick={modal.handleClose}
>
Close
Expand Down
5 changes: 4 additions & 1 deletion client/src/features/home/HamburgerNav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ function HamburgerNav({ logo, logotext }) {
return (
<li key={Link.name} className="text-xl my-7">
{Link.type === "button" && (
<button onClick={() => navigate(Link.link)}>
<button
onClick={() => navigate(Link.link)}
className=" cursor-pointer"
>
{Link.name}
</button>
)}
Expand Down
6 changes: 3 additions & 3 deletions client/src/features/home/NavButtons.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const NavButtons = ({ HomeIcon, LoginIcon, CalendarIcon }) => {
{/* Home Button */}
<button
onClick={() => routing.setCurrentPage("landingPage")}
className="bg-white border-2 border-black rounded-2xl flex flex-col justify-center items-center p-1 w-24 h-24 lg:w-28 lg:h-28 xl:w-32 xl:h-32 focus:ring-4 focus:ring-black"
className="bg-white border-2 border-black rounded-2xl flex flex-col justify-center items-center p-1 w-24 h-24 lg:w-28 lg:h-28 xl:w-32 xl:h-32 focus:ring-4 focus:ring-black cursor-pointer"
>
<div className="flex justify-center">
<HomeIcon className="text-main-blue w-7 h-7 lg:w-10 lg:h-10" />
Expand All @@ -28,7 +28,7 @@ const NavButtons = ({ HomeIcon, LoginIcon, CalendarIcon }) => {
</button>
{/* Log In & Log Out Button */}
<button
className="bg-white border-2 border-black rounded-2xl flex flex-col justify-center items-center p-1 w-24 h-24 lg:w-28 lg:h-28 xl:w-32 xl:h-32 focus:ring-4 focus:ring-black"
className="bg-white border-2 border-black rounded-2xl flex flex-col justify-center items-center p-1 w-24 h-24 lg:w-28 lg:h-28 xl:w-32 xl:h-32 focus:ring-4 focus:ring-black cursor-pointer"
onClick={isAuthenticated() ? logout : handleLogin}
>
<div className="flex justify-center">
Expand All @@ -42,7 +42,7 @@ const NavButtons = ({ HomeIcon, LoginIcon, CalendarIcon }) => {

<button
onClick={() => navigate("calendar")}
className="bg-white border-2 border-black rounded-2xl flex flex-col justify-center items-center p-1 w-24 h-24 lg:w-28 lg:h-28 xl:w-32 xl:h-32 focus:ring-4 focus:ring-black"
className="bg-white border-2 border-black rounded-2xl flex flex-col justify-center items-center p-1 w-24 h-24 lg:w-28 lg:h-28 xl:w-32 xl:h-32 focus:ring-4 focus:ring-black cursor-pointer"
>
<div className="flex justify-center">
<CalendarIcon className="text-main-orange w-7 h-7 lg:w-10 lg:h-10" />
Expand Down
2 changes: 1 addition & 1 deletion client/src/features/modal/WelcomeUserModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const WelcomeUserModal = ({ handleClose }) => {
<div>
<h2>
Hello, {auth.user.displayName}, We are happy to welcome you in
Together. Looks, like you are all set! Cant wait for you to begin
Together. Looks, like you are all set! Can't wait for you to begin
your journey with us!
</h2>
</div>
Expand Down
10 changes: 5 additions & 5 deletions client/src/pages/LandingPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import HamburgerNav from "../features/home/HamburgerNav";
const LandingPage = () => {
const cards = [
{
heading: "Join 100devs",
heading: "Join 100Devs",
description: (
<>
<a
Expand Down Expand Up @@ -42,14 +42,14 @@ const LandingPage = () => {
heading: "Community Taught",
description: (
<>
Keep track of your 100devs course progress using{" "}
Keep track of your 100Devs course progress using{" "}
<a
className="underline font-bold"
href={`https://communitytaught.org/`}
>
Community Taught
</a>{" "}
created by 100devs alumna, Laura Abro.
created by 100Devs alumna, Laura Abro.
<br></br>
<br></br>
<a
Expand Down Expand Up @@ -96,8 +96,8 @@ const LandingPage = () => {
<>
<p>
Together is a community-driven open source project backed by
members of 100devs. Together is not only designed to be a
valuable tool to the 100devs community but also provides an
members of 100Devs. Together is not only designed to be a
valuable tool to the 100Devs community but also provides an
additional opportunity for students to learn in a group
environment. Together is open to all varying skill sets and
encourages peer programming.
Expand Down
11 changes: 0 additions & 11 deletions client/src/setupProxy.js

This file was deleted.

67 changes: 67 additions & 0 deletions docs/01-Team-Organization.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# Together Team Structure

Listed below is the current team of Together. Discussion happens in [Together's Discord Thread](https://discord.com/channels/735923219315425401/1038482732633825442). Here are some people involved in the project that you can chat with in the Discord thread.

| Role | Name | Discord | Subject Matter Expert (Related to Together) |
| ----------------------------------------- | ------ | ------- | ---------------------------------------------------------------- |
| Team Lead, Maintainer, Developer | Devin |
| Maintainer, Developer, Software Architect | Rask |
| Maintainer | Eric |
| Maintainer, Developer | Emme |
| Design Lead | NEEDED | | Please reach out if you'd like to be design lead on this project |
| Designer | NEEDED | | Please reach out if you'd like to be a designer on this project |
| Scrum Master | Evelyn |

## Responsibilities

### Team Lead

- Responsible for the project vision
- Owns end-to-end delivery of the project
- Owns project delivery plan

### Maintainer

- Reviewing and merging pull requests from contributors
- Ensuring that the code in the repository adheres to any established coding standards or conventions
- Communicating with users and contributors to provide support and guidance

### Software Architect

- Owns technical quality of the delivery
- Maintains software architecture
- New developer onboarding
- Sets code review process

### Designer

- Collaborating with product management and engineer to define and implement innovative solutions for product directions, visuals, and experience
- Executing all visual design stages from concept to final hand-off
- Conceptualizing original ideas that bring simplicity and user friendliness to complex design

### Developer

- Engineers and stabilizes the product
- Solves any technical problems emerging during the development lifecycle

### Scrum Master

- Facilitate scrum meetings
- Manages meeting minutes for Standups

#### Past Contributors

| Role | Name | Discord | Subject Matter Expert (Related to Together) |
| -------------------------- | ------- | ----------------- | ---------------------------------------------------------- |
| Team Lead | Caleb | Caleb#9822 | Git |
| Maintainer | Chanel | InstincDev#9789 | React, Onboarding |
| Maintainer | Matt | Saker Tarsos#7223 | React, Onboarding |
| Software Architect | TBD | TBD |
| Full-Stack System Engineer | Eric | intelagense#1958 |
| Design Lead | Natalie | Natashka#3565 | Design & Figma |
| Designer | Ana | coast#5240 |
| Developer | Joe | KaKo#3766 | React, Onboading, Git |
| Developer | Isaac | egglitty#9573 | JavaScript, React, Onboarding, System Architecture, Github |
| Developer | Rick | constantRic#2670 | JavaScript, React, Backend |
| TBD | Lucious | brotahman#7165 | React, Github, Onboarding |
| Scrum Master | Trizz | TrizzIzBizy2#7686 |
Loading