Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
3eb94d8
Bump path-parse from 1.0.6 to 1.0.7
dependabot[bot] Aug 11, 2021
5a2e2aa
Bump path-parse from 1.0.6 to 1.0.7 in /shared
dependabot[bot] Aug 11, 2021
dc58237
Bump tmpl from 1.0.4 to 1.0.5 in /frontend
dependabot[bot] Sep 21, 2021
600ec14
Bump axios from 0.21.1 to 0.21.4
dependabot[bot] Oct 21, 2021
4123347
Bump axios from 0.21.1 to 0.21.2 in /frontend
dependabot[bot] Nov 5, 2021
e8dd262
Bump object-path from 0.11.5 to 0.11.8 in /shared
dependabot[bot] Dec 8, 2021
86252d3
Bump ajv from 6.12.2 to 6.12.6
dependabot[bot] Feb 12, 2022
91f498a
Bump ajv from 6.12.2 to 6.12.6 in /shared
dependabot[bot] Feb 13, 2022
1a1f8c3
Bump follow-redirects from 1.14.1 to 1.14.8
dependabot[bot] Feb 14, 2022
bc071d6
Bump lodash-es from 4.17.15 to 4.17.21
dependabot[bot] Mar 15, 2022
d9d02ae
Bump lodash-es from 4.17.15 to 4.17.21 in /shared
dependabot[bot] Mar 15, 2022
ef521b5
Merge pull request #475 from hackjunction/dependabot/npm_and_yarn/pat…
wickathou Feb 16, 2024
4747d0d
Merge pull request #477 from hackjunction/dependabot/npm_and_yarn/sha…
wickathou Feb 16, 2024
87e95ae
Merge pull request #479 from hackjunction/dependabot/npm_and_yarn/sha…
wickathou Feb 16, 2024
fe1f11a
Merge pull request #480 from hackjunction/dependabot/npm_and_yarn/fro…
wickathou Feb 16, 2024
0ee3a45
Merge pull request #485 from hackjunction/dependabot/npm_and_yarn/axi…
wickathou Feb 16, 2024
54d8289
Merge branch 'dependabot/STAG' into dependabot/npm_and_yarn/frontend/…
wickathou Feb 16, 2024
12a7478
Merge pull request #490 from hackjunction/dependabot/npm_and_yarn/fro…
wickathou Feb 16, 2024
df1bc77
Create dependabot.yml
wickathou Feb 16, 2024
28710e2
Updated object-path to 0.11.8
wickathou Feb 16, 2024
aac170f
Merge pull request #760 from hackjunction/temp/dependabot/bump
wickathou Feb 16, 2024
4a8baf4
Merge pull request #515 from hackjunction/dependabot/npm_and_yarn/ajv…
wickathou Feb 16, 2024
f75fa5f
Merge pull request #517 from hackjunction/dependabot/npm_and_yarn/sha…
wickathou Feb 16, 2024
2eb2e38
Merge pull request #518 from hackjunction/dependabot/npm_and_yarn/fol…
wickathou Feb 16, 2024
51aad1a
Merge pull request #521 from hackjunction/dependabot/npm_and_yarn/lod…
wickathou Feb 16, 2024
7b22d9c
Merge pull request #522 from hackjunction/dependabot/npm_and_yarn/sha…
wickathou Feb 16, 2024
f3cabd5
Updated ansi-regex dependency
wickathou Feb 16, 2024
58db378
Merge pull request #761 from hackjunction/temp/dependabot/bump2
wickathou Feb 16, 2024
4b46aa6
Bump ip from 1.1.5 to 1.1.9
dependabot[bot] Feb 21, 2024
9825fa0
Bump axios from 0.21.4 to 0.28.0 in /frontend
dependabot[bot] Feb 21, 2024
e19aee4
Bump axios from 0.21.4 to 0.28.0 in /backend
dependabot[bot] Feb 21, 2024
c446792
Bump ip from 1.1.8 to 1.1.9 in /frontend
dependabot[bot] Feb 22, 2024
95e15a9
Merge pull request #768 from hackjunction/dependabot/npm_and_yarn/fro…
wickathou Feb 27, 2024
60045f3
Merge pull request #767 from hackjunction/dependabot/npm_and_yarn/bac…
wickathou Feb 27, 2024
cb7b21f
Merge branch 'dependabot/STAG' into dependabot/npm_and_yarn/frontend/…
wickathou Feb 27, 2024
9c19d34
Merge pull request #766 from hackjunction/dependabot/npm_and_yarn/fro…
wickathou Feb 27, 2024
ffcd50b
Merge pull request #765 from hackjunction/dependabot/npm_and_yarn/ip-…
wickathou Feb 27, 2024
463bcbb
Bumped minimist from v1.2.5 to v1.2.8
wickathou Feb 27, 2024
5453f50
Merge pull request #773 from wickathou/temp/dependabot-updates-1
wickathou Feb 27, 2024
4e4dc1e
Updating minimist from 1.2.5 to 1.2.8 in shared
wickathou Feb 27, 2024
9d01fd2
Merge pull request #774 from wickathou/temp/dependabot-updates-1
wickathou Feb 27, 2024
9457f34
Updated Africa, Asia and UE pipelines to restart pm2 properly
wickathou Mar 22, 2024
4101b96
Merge pull request #790 from wickathou/devops/update-to-pipelines
wickathou Mar 22, 2024
4901199
Modified challenge validations
wickathou Mar 22, 2024
e87023c
Merge pull request #791 from wickathou/hotfix/adjusting-challenge-val…
wickathou Mar 22, 2024
f26a4a0
Fixed typo on challenge page validation
wickathou Mar 22, 2024
9036c5b
Merge pull request #792 from wickathou/hotfix/adjusting-challenge-val…
wickathou Mar 22, 2024
40a8117
Merge pull request #763 from hackjunction/dependabot/STAG
wickathou Apr 10, 2024
a1c2014
Bump loader-utils from 1.4.0 to 1.4.2
dependabot[bot] Apr 10, 2024
b3fbaa8
Merge pull request #578 from hackjunction/dependabot/npm_and_yarn/loa…
wickathou Apr 10, 2024
7093682
Rolled back to latest working commit
wickathou Apr 12, 2024
498f967
first commit
wickathou Apr 15, 2024
9562562
Merge branch 'fix/STAG-rollback-b3fbaa8161cfe3285df16d63fac9a8c77b72b…
wickathou Apr 15, 2024
30e4d22
rolled back pipelines
wickathou Apr 15, 2024
a71981f
Updated frontend package-lock
wickathou Apr 15, 2024
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
38 changes: 38 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
# Root
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
assignees:
- "wickathou"

- package-ecosystem: "npm" # See documentation for possible values
# Frontend
directory: "/frontend/" # Location of package manifests
schedule:
interval: "weekly"
assignees:
- "wickathou"

- package-ecosystem: "npm" # See documentation for possible values
# Backend
directory: "/backend/" # Location of package manifests
schedule:
interval: "weekly"
assignees:
- "wickathou"

- package-ecosystem: "npm" # See documentation for possible values
# Shared
directory: "/shared/" # Location of package manifests
schedule:
interval: "weekly"
assignees:
- "wickathou"
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

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.


### Features

* Custom event configuration
Expand Down
354 changes: 125 additions & 229 deletions backend/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"apollo-server-core": "^3.10.0",
"apollo-server-express": "^2.19.0",
"auth0": "^2.31.1",
"axios": "^0.21.1",
"axios": "^0.28.0",
"bcrypt": "^5.0.0",
"better-npm-run": "^0.1.1",
"bluebird": "^3.7.2",
Expand Down
21 changes: 14 additions & 7 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@welldone-software/why-did-you-render": "^4.2.5",
"antd": "^4.3.1",
"auth0-js": "^9.13.2",
"axios": "^0.21.1",
"axios": "^0.28.0",
"babel-plugin-import": "^1.13.0",
"cloudinary-react": "^1.5.0",
"connected-react-router": "^6.8.0",
Expand All @@ -35,7 +35,7 @@
"moment": "^2.26.0",
"moment-timezone": "^0.5.31",
"notistack": "^0.9.16",
"object-path": "^0.11.5",
"object-path": "^0.11.8",
"pdf-lib": "^1.17.1",
"qrcode.react": "^1.0.0",
"react": "16.13.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,20 @@ export default ({ value, onChange }) => {
)
}

const styling = {
challengeNameMaxLength: 200,
challengeSlugMaxLength: 200,
textAreaMaxLength: 3000,
}

const renderForm = () => (
<>
<Grid item xs={12}>
<TextInput
label="Challenge name"
value={name}
onChange={handleNameChange}
maxLength={50}
maxLength={styling.challengeNameMaxLength}
/>
<Typography variant="caption">
The unique publicly visible name of the challenge.
Expand All @@ -221,7 +227,7 @@ export default ({ value, onChange }) => {
label="Unique slug"
value={slug}
onChange={setSlug}
maxLength={50}
maxLength={styling.challengeSlugMaxLength}
/>
<Typography variant="caption">
A unique slug for the challenge. This will be used in e.g.
Expand Down Expand Up @@ -280,7 +286,7 @@ export default ({ value, onChange }) => {
value={description}
onChange={setDescription}
placeholder="Description goes here"
maxLength={1000}
maxLength={styling.textAreaMaxLength}
/>
<Typography variant="caption">
Challenge description.
Expand All @@ -293,7 +299,7 @@ export default ({ value, onChange }) => {
value={insights}
onChange={setInsights}
placeholder="Insights go here"
maxLength={1000}
maxLength={styling.textAreaMaxLength}
/>
<Typography variant="caption">Challenge insights.</Typography>
</Grid>
Expand All @@ -304,7 +310,7 @@ export default ({ value, onChange }) => {
value={resources}
onChange={setResources}
placeholder="Resource go here"
maxLength={1000}
maxLength={styling.textAreaMaxLength}
/>
<Typography variant="caption">Challenge resources.</Typography>
</Grid>
Expand All @@ -315,7 +321,7 @@ export default ({ value, onChange }) => {
value={prizes}
onChange={setPrizes}
placeholder="Prizes go here"
maxLength={1000}
maxLength={styling.textAreaMaxLength}
/>
<Typography variant="caption">Challenge Prizes.</Typography>
</Grid>
Expand All @@ -326,7 +332,7 @@ export default ({ value, onChange }) => {
value={criteria}
onChange={setCriteria}
placeholder="Criteria go here"
maxLength={1000}
maxLength={styling.textAreaMaxLength}
/>
<Typography variant="caption">Challenge criteria.</Typography>
</Grid>
Expand All @@ -337,7 +343,7 @@ export default ({ value, onChange }) => {
value={companyInfo}
onChange={setCompanyInfo}
placeholder="Company info goes here"
maxLength={1000}
maxLength={styling.textAreaMaxLength}
/>
<Typography variant="caption">Company Info</Typography>
</Grid>
Expand Down
63 changes: 25 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@
"npm": "6.9.0"
},
"type": "module"
}
}
Loading