Skip to content
Closed
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
11 changes: 11 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[[source]]
Comment thread
WRNoble marked this conversation as resolved.
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]

[packages]

[requires]
python_version = "3.8"
1 change: 1 addition & 0 deletions api/accounts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class Profile(models.Model):
'community.Event', related_name='people', null=True, blank=True)
connections = models.ManyToManyField(
'self', related_name='friends', null=True, blank=True)

# Posts, comments, and replies to be defined as foreign key on those respective models within forum app
# CoTrip media defined as foreign key in community app
groups = models.ManyToManyField(
Expand Down
2 changes: 1 addition & 1 deletion api/community/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
class GroupSerializer(serializers.ModelSerializer):
class Meta:
model = Group
fields = '__all__'
fields = ['title', 'description', 'location', 'posts', 'members']

class EventSerializer(serializers.ModelSerializer):
group = serializers.CharField()
Expand Down
2 changes: 1 addition & 1 deletion api/trip/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
path('activity', ActivityList.as_view(), name='activity_list'),
path('location/bystate', LocationListByState.as_view(), name='location_list_by_state'),
path('location/states', StateList.as_view(), name='state_list'),
path('activity/<int:pk>', ActivityDetail.as_view(), name='activity_detail')
path('activity/<int:pk>', ActivityDetail.as_view(), name='activity_detail'),
]
1 change: 1 addition & 0 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { fas } from "@fortawesome/free-solid-svg-icons";
import { far } from "@fortawesome/free-regular-svg-icons";
import { BASE_URL } from "./services/constants";
import { handleSignup, handleLogin, handleLogout } from "./services/User";
import GroupPage from "./components/GroupPage/GroupPage"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you using this page somewhere? Should there be a route for it?


library.add(
fab,
Expand Down
2 changes: 2 additions & 0 deletions client/src/components/GroupPage/GroupPage.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@


47 changes: 47 additions & 0 deletions client/src/components/GroupPage/GroupPage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import React from 'react';

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this page in the components directory and not the pages directory?

import './GroupPage.css';
import GroupCard from "../GroupCard/GroupCard";
import Navbar from '../Navbar/Navbar';
import Footer from '../Footer/Footer';
import card1 from "assets/images/card-image-3.png";
import card2 from "assets/images/card-image-2.png";
import card3 from "assets/images/card-image.png";
import people from "assets/images/profile_default.svg";


const GroupPage = props => {

return (
<div>
<Navbar
to={"/member-page"}
profileImage={people}
/>


<div className='wrapper'>
<h1>Groups You Can Join!</h1>
</div>
<div className="HomePage__group-cards-container">

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are these classes coming from?

<span className="HomePage__groupcard-1">
<GroupCard
name="DIY with your kids"
members="98"
location="Boston, MA"
picture={card1}
/>
Comment on lines +27 to +32

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be coming from the API?

</span>
<span className="HomePage__groupcard-2">
<GroupCard name="Mystery Stories!" members="213" location="NYC" picture={card2} />
</span>
<span className="HomePage__groupcard-3">
<GroupCard name="Bay Cruise" members="98" location="Lisbon" picture={card3} />
</span>
</div>
<Footer />
</div>
)
}


export default GroupPage
2 changes: 2 additions & 0 deletions client/src/components/GroupPage/GroupPage.stories.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import React from "react";
import { storiesOf } from "@storybook/react";
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Card from "../Card/Card";
import TripCard from "../TripCard/TripCard";

const UpcomingTripsCard = props => {

return (
<Card color="pink" className="UpcomingTripsCard" size="large">
<header className="UpcomingTripsCard__header">Upcoming Trips</header>
Expand Down
Loading