Skip to content

Commit d94bfdc

Browse files
joanagmaiamariobalcaJoan Reyero
authored
Organizations module (#274)
Co-authored-by: Mário Balça <mariobalca@users.noreply.github.com> Co-authored-by: Joan Reyero <joan@crowd.dev>
1 parent a255d8f commit d94bfdc

56 files changed

Lines changed: 3158 additions & 246 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
9.34 KB
Loading
6.92 KB
Loading

frontend/src/assets/scss/badge.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111

1212
&--brand {
13-
@apply bg-brand-500 text-white;
13+
@apply bg-brand-50 text-brand-600;
1414
}
1515

1616
&--black {

frontend/src/assets/scss/buttons.scss

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -310,20 +310,13 @@
310310
color: #1d9bf0;
311311
}
312312

313-
&--linkedin,
314-
&--linkedin:hover {
315-
@apply cursor-pointer;
316-
background-color: rgba(2, 116, 179, 0.1);
317-
color: #0274b3;
318-
}
319-
320313
&--discord,
321314
&--discord:hover {
322315
background-color: rgba(88, 101, 242, 0.15);
323316
}
324317

325-
&--slack,
326-
&--slack:hover {
327-
@apply bg-white;
318+
&--crunchbase,
319+
&--crunchbase:hover {
320+
background: rgba(20, 106, 255, 0.15);
328321
}
329322
}

frontend/src/i18n/en.js

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,39 @@ const en = {
224224
organization: {
225225
name: 'organization',
226226
label: 'Organizations',
227-
menu: 'Organizations'
227+
menu: 'Organizations',
228+
create: {
229+
success: 'Organization successfully saved',
230+
error:
231+
'There was an error creating the organization'
232+
},
233+
update: {
234+
success: 'Organization successfully saved',
235+
error:
236+
'There was an error updating the organization'
237+
},
238+
destroy: {
239+
success: 'Organization successfully deleted'
240+
},
241+
destroyAll: {
242+
success: 'Organization(s) successfully deleted'
243+
},
244+
edit: {
245+
title: 'Edit Organization'
246+
},
247+
fields: {
248+
name: 'Name',
249+
description: 'Description',
250+
website: 'Website',
251+
location: 'Location',
252+
employees: 'Number of employees',
253+
revenueRange: 'Annual revenue',
254+
activeSince: 'Active since',
255+
github: 'GitHub',
256+
twitter: 'Twitter',
257+
linkedin: 'LinkedIn',
258+
crunchbase: 'Crunchbase'
259+
}
228260
},
229261

230262
activity: {
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export default {
2+
image: '/images/crunchbase_logo.png',
3+
hideAsIntegration: true
4+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import config from './config'
2+
3+
export default config

frontend/src/integrations/integrations-config.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import stackoverflow from './stackoverflow'
88
import reddit from './reddit'
99
import linkedin from './linkedin'
1010
import zapier from './zapier'
11+
import crunchbase from './crunchbase'
1112
import make from './make'
1213

1314
class IntegrationsConfig {
@@ -23,7 +24,8 @@ class IntegrationsConfig {
2324
reddit,
2425
linkedin,
2526
zapier,
26-
make
27+
make,
28+
crunchbase
2729
}
2830
}
2931

@@ -54,13 +56,15 @@ class IntegrationsConfig {
5456
}
5557

5658
mappedConfigs(store) {
57-
return this.configs.map((i) => this._mapper(i, store))
59+
return this.configs
60+
.map((i) => this._mapper(i, store))
61+
.filter((i) => !i.hideAsIntegration)
5862
}
5963

6064
mappedEnabledConfigs(store) {
61-
return this.enabledConfigs.map((i) =>
62-
this._mapper(i, store)
63-
)
65+
return this.enabledConfigs
66+
.map((i) => this._mapper(i, store))
67+
.filter((i) => !i.hideAsIntegration)
6468
}
6569
}
6670

frontend/src/integrations/linkedin/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ export default {
55
borderColor: '#FFFFFF',
66
description:
77
"We're currently working on this integration.",
8-
image: '/images/linkedin.svg'
8+
image: '/images/linkedin_logo.png'
99
}

frontend/src/modules/activity/activity-model.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import JsonField from '@/shared/fields/json-field'
1010
import SearchField from '@/shared/fields/search-field'
1111
import SentimentField from '@/shared/fields/sentiment-field'
1212
import ActivityPlatformField from './activity-platform-field'
13-
import ActivityDateField from './activity-date-field'
13+
import ActivityDateField from '@/shared/fields/activity-date-field'
1414
import ActivityTypeField from './activity-type-field'
1515

1616
function label(name) {

0 commit comments

Comments
 (0)