Skip to content

Commit 37eb091

Browse files
authored
Merge pull request #823 from wickathou/fix/STAG-rollback
Fix/stag rollback
2 parents efe40e3 + a71981f commit 37eb091

11 files changed

Lines changed: 242 additions & 309 deletions

File tree

.github/dependabot.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "npm" # See documentation for possible values
9+
# Root
10+
directory: "/" # Location of package manifests
11+
schedule:
12+
interval: "weekly"
13+
assignees:
14+
- "wickathou"
15+
16+
- package-ecosystem: "npm" # See documentation for possible values
17+
# Frontend
18+
directory: "/frontend/" # Location of package manifests
19+
schedule:
20+
interval: "weekly"
21+
assignees:
22+
- "wickathou"
23+
24+
- package-ecosystem: "npm" # See documentation for possible values
25+
# Backend
26+
directory: "/backend/" # Location of package manifests
27+
schedule:
28+
interval: "weekly"
29+
assignees:
30+
- "wickathou"
31+
32+
- package-ecosystem: "npm" # See documentation for possible values
33+
# Shared
34+
directory: "/shared/" # Location of package manifests
35+
schedule:
36+
interval: "weekly"
37+
assignees:
38+
- "wickathou"

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
We want to provide the best tools for organizing hackathons, so we have developed a platform that anybody can use. Junction App provides an all-in-one platform for hackathon organizing from custom event creation to project judging.
2626

27-
2827
### Features
2928

3029
* Custom event configuration

backend/package-lock.json

Lines changed: 125 additions & 229 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"apollo-server-core": "^3.10.0",
3030
"apollo-server-express": "^2.19.0",
3131
"auth0": "^2.31.1",
32-
"axios": "^0.21.1",
32+
"axios": "^0.28.0",
3333
"bcrypt": "^5.0.0",
3434
"better-npm-run": "^0.1.1",
3535
"bluebird": "^3.7.2",

frontend/package-lock.json

Lines changed: 14 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@welldone-software/why-did-you-render": "^4.2.5",
1818
"antd": "^4.3.1",
1919
"auth0-js": "^9.13.2",
20-
"axios": "^0.21.1",
20+
"axios": "^0.28.0",
2121
"babel-plugin-import": "^1.13.0",
2222
"cloudinary-react": "^1.5.0",
2323
"connected-react-router": "^6.8.0",
@@ -35,7 +35,7 @@
3535
"moment": "^2.26.0",
3636
"moment-timezone": "^0.5.31",
3737
"notistack": "^0.9.16",
38-
"object-path": "^0.11.5",
38+
"object-path": "^0.11.8",
3939
"pdf-lib": "^1.17.1",
4040
"qrcode.react": "^1.0.0",
4141
"react": "16.13.1",

frontend/src/pages/_dashboard/renderDashboard/organiser/edit/challenges/ChallengesForm.js

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,14 +203,20 @@ export default ({ value, onChange }) => {
203203
)
204204
}
205205

206+
const styling = {
207+
challengeNameMaxLength: 200,
208+
challengeSlugMaxLength: 200,
209+
textAreaMaxLength: 3000,
210+
}
211+
206212
const renderForm = () => (
207213
<>
208214
<Grid item xs={12}>
209215
<TextInput
210216
label="Challenge name"
211217
value={name}
212218
onChange={handleNameChange}
213-
maxLength={50}
219+
maxLength={styling.challengeNameMaxLength}
214220
/>
215221
<Typography variant="caption">
216222
The unique publicly visible name of the challenge.
@@ -221,7 +227,7 @@ export default ({ value, onChange }) => {
221227
label="Unique slug"
222228
value={slug}
223229
onChange={setSlug}
224-
maxLength={50}
230+
maxLength={styling.challengeSlugMaxLength}
225231
/>
226232
<Typography variant="caption">
227233
A unique slug for the challenge. This will be used in e.g.
@@ -280,7 +286,7 @@ export default ({ value, onChange }) => {
280286
value={description}
281287
onChange={setDescription}
282288
placeholder="Description goes here"
283-
maxLength={1000}
289+
maxLength={styling.textAreaMaxLength}
284290
/>
285291
<Typography variant="caption">
286292
Challenge description.
@@ -293,7 +299,7 @@ export default ({ value, onChange }) => {
293299
value={insights}
294300
onChange={setInsights}
295301
placeholder="Insights go here"
296-
maxLength={1000}
302+
maxLength={styling.textAreaMaxLength}
297303
/>
298304
<Typography variant="caption">Challenge insights.</Typography>
299305
</Grid>
@@ -304,7 +310,7 @@ export default ({ value, onChange }) => {
304310
value={resources}
305311
onChange={setResources}
306312
placeholder="Resource go here"
307-
maxLength={1000}
313+
maxLength={styling.textAreaMaxLength}
308314
/>
309315
<Typography variant="caption">Challenge resources.</Typography>
310316
</Grid>
@@ -315,7 +321,7 @@ export default ({ value, onChange }) => {
315321
value={prizes}
316322
onChange={setPrizes}
317323
placeholder="Prizes go here"
318-
maxLength={1000}
324+
maxLength={styling.textAreaMaxLength}
319325
/>
320326
<Typography variant="caption">Challenge Prizes.</Typography>
321327
</Grid>
@@ -326,7 +332,7 @@ export default ({ value, onChange }) => {
326332
value={criteria}
327333
onChange={setCriteria}
328334
placeholder="Criteria go here"
329-
maxLength={1000}
335+
maxLength={styling.textAreaMaxLength}
330336
/>
331337
<Typography variant="caption">Challenge criteria.</Typography>
332338
</Grid>
@@ -337,7 +343,7 @@ export default ({ value, onChange }) => {
337343
value={companyInfo}
338344
onChange={setCompanyInfo}
339345
placeholder="Company info goes here"
340-
maxLength={1000}
346+
maxLength={styling.textAreaMaxLength}
341347
/>
342348
<Typography variant="caption">Company Info</Typography>
343349
</Grid>

package-lock.json

Lines changed: 25 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@
7171
"npm": "6.9.0"
7272
},
7373
"type": "module"
74-
}
74+
}

0 commit comments

Comments
 (0)