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

Feature/remove organisation name from activities #33

Merged
merged 6 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ It's important to also add this declaration in `modules.js` for the apostrophe b
- 🎉 [event-overview](packages/event-overview) – _React component to view events in the openstad frontend ("activiteiten overzicht")_
- 🌍 [openstad-event-planner-widgets](packages/openstad-event-planner-widgets) – _Apostrophe CMS module that bundles the React components_

### Linking in development
You can use your local version of openstad-event-planner/browser-widgets and attach it to your running openstad-frontend instance.
To do this, first build the package you want to link (cd into packages/openstad-event-planner-widgets) and then use npm link.

In openstad-frontend, first install all dependencies using npm install. Afterwards run 'npm link @savvycodes/openstad-event-planner-widgets'. Rerun the frontend and you should see your local version. Do take note that without a watcher, you will need to rebuild the dependency each time a change to it is made.

### Publishing

You can use lerna to publish a new version to npm, for now this is done manually
Expand Down
32,865 changes: 22,754 additions & 10,111 deletions packages/openstad-event-browser-widgets/package-lock.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ export function EventTiles({ events }: any) {
locale: nl,
})}
</p>
<p className="events-activity-card__text-organisation">
{/* <p className="events-activity-card__text-organisation">
Aanbieder: {event.organisation.name}
</p>
</p> */}
<p className="events-activity-card__text-description">
{event.description.replace(/(<([^>]+)>)/gi, '').slice(0, 80)}
{event.description.length > 80 ? '...' : null}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ export function EventDetailPage({ params }: RouteComponentProps) {
<div className="events-event-container__layout">
<div className="events-event-container__information">
<h2>{event.name}</h2>
<p className="events-activity-card__text-organisation">
{/* <p className="events-activity-card__text-organisation">
Aanbieder: {event.organisation.name}
</p>
</p> */}

<div className="events-tags-container">
<p className="events-tag">{event.district}</p>
Expand Down
52,381 changes: 36,474 additions & 15,907 deletions packages/openstad-event-favorites-widgets/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/openstad-event-planner-widgets/example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/>
<link
rel="stylesheet"
href="https://midzomermokum.nl/apos-minified/anon-cl4nvirmc0007yzor2d1symno.css"
href="https://midzomermokum.nl/apos-minified/anon-cllarzp6o0007b2oob4a17dxu.css"
/>
<link rel="stylesheet" href="./css/palette-styles.css" />
<link
Expand Down
2 changes: 1 addition & 1 deletion packages/openstad-event-planner-widgets/example/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { App } from '../src/app';

const config = {
jwt:
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjUsImNsaWVudCI6ImRlZmF1bHQiLCJpYXQiOjE2NTU4MDk0MDYsImV4cCI6MTY3MTUzNDIwNn0.omWjp3pUos13OTossmhVTxEuxP02TyiNa5ehjqB6k2g',
'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOjQsImNsaWVudCI6ImRlZmF1bHQiLCJpYXQiOjE3MTc1OTcwMTAsImV4cCI6MTczMzMyMTgxMH0.x78F70Gm8hn3gKk7p-6bUczjEx_bCg85Y1kOvGvYqLk',
siteId: 3,
apiUrl: 'http://localhost:8111',
imageUrl: '/image',
Expand Down
Loading
Loading