Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into refactor/toolbar
Browse files Browse the repository at this point in the history
# Conflicts:
#	client/modules/IDE/components/Toolbar.jsx
  • Loading branch information
lindapaiste committed Jul 23, 2023
2 parents 2c8491c + c48a036 commit f6f8e7b
Show file tree
Hide file tree
Showing 59 changed files with 27,888 additions and 60,702 deletions.
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"no-console": 0,
"no-alert": 0,
"no-underscore-dangle": 0,
"no-useless-catch": 2,
"max-len": [1, 120, 2, {"ignoreComments": true, "ignoreTemplateLiterals": true}],
"quote-props": [1, "as-needed"],
"no-unused-vars": [1, {"vars": "local", "args": "none"}],
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ jobs:
with:
ref: release
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
with:
platforms: linux/amd64,linux/arm64
- name: Login to Docker Hub
uses: docker/login-action@v1
with:
Expand Down
7 changes: 6 additions & 1 deletion client/components/Nav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class Nav extends React.PureComponent {
super(props);
this.handleSave = this.handleSave.bind(this);
this.handleNew = this.handleNew.bind(this);
this.handleDuplicate = this.handleDuplicate.bind(this);
this.handleShare = this.handleShare.bind(this);
this.handleDownload = this.handleDownload.bind(this);
this.handleLangSelection = this.handleLangSelection.bind(this);
Expand All @@ -56,6 +57,10 @@ class Nav extends React.PureComponent {
}
}

handleDuplicate() {
this.props.cloneProject();
}

handleLangSelection(event) {
this.props.setLanguage(event.target.value);
this.props.showToast(1500);
Expand Down Expand Up @@ -132,7 +137,7 @@ class Nav extends React.PureComponent {
</NavMenuItem>
<NavMenuItem
hideIf={!this.props.project.id || !this.props.user.authenticated}
onClick={this.props.cloneProject}
onClick={this.handleDuplicate}
>
{this.props.t('Nav.File.Duplicate')}
</NavMenuItem>
Expand Down
6 changes: 1 addition & 5 deletions client/images/down-arrow-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions client/images/down-arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 3 additions & 7 deletions client/images/down-filled-triangle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 2 additions & 8 deletions client/images/exit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions client/images/file.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions client/images/folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 2 additions & 8 deletions client/images/minus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions client/images/p5js-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 4 additions & 18 deletions client/images/play.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions client/images/plus-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 2 additions & 8 deletions client/images/plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 1 addition & 14 deletions client/images/preferences.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions client/images/right-arrow-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 3 additions & 17 deletions client/images/stop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 3 additions & 10 deletions client/images/triangle-arrow-down-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 3 additions & 10 deletions client/images/triangle-arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 2 additions & 9 deletions client/images/triangle-arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 3 additions & 10 deletions client/images/triangle-arrow-right-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit f6f8e7b

Please sign in to comment.