Skip to content

Commit

Permalink
Merge pull request #678 from engaging-computing/dev
Browse files Browse the repository at this point in the history 
Version 3.2.1
  • Loading branch information
@rjmara
rjmara committed Jun 12, 2023
2 parents 3e61b10 + cc5e24b commit d13e29a
Show file tree
Hide file tree
Showing 10 changed files with 99 additions and 80 deletions.
108 changes: 54 additions & 54 deletions package-lock.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"dependencies": {
"@engaging-computing/aframe-physics-system": "^4.0.0",
"@material-ui/core": "^4.12.3",
"aframe": "^1.3.0",
"aframe": "1.2",
"aframe-animation-component": "^5.0.0",
"aframe-environment-component": "^1.3.1",
"aframe-extras": "^4.1.2",
Expand Down
6 changes: 3 additions & 3 deletions src/components/layouts/ReferenceExample.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import "../../css/ReferencePage.css";
* @returns {HTMLElement} Layout for example scene page
*/

export const ReferenceExample = ({ editor, user, scene, referenceExample, referenceExampleActions, editorActions, authActions, projectActions, projects, courseActions, courses, match, sceneActions, collectionActions, collections, usersettings, userActions }) => (
export const ReferenceExample = ({ editor, user, scene, referenceExample, referenceExampleActions, editorActions, authActions, projectActions, projects, courseActions, courses, match, sceneActions, collectionActions, collections, userSettings, userActions }) => (
<div className="App">
<Header
logging={authActions}
Expand Down Expand Up @@ -49,7 +49,7 @@ export const ReferenceExample = ({ editor, user, scene, referenceExample, refere
<div id="interface" className="col-12 col-md-4">
<RefExInfo referenceExample={referenceExample} />
<div className='ref-ex-edit'>
<Editor refresh={editorActions.refresh} render={editorActions.render} text={editor.text} user={user} settings={usersettings} userActions={userActions} />
<Editor refresh={editorActions.refresh} render={editorActions.render} text={editor.text} user={user} settings={userSettings} userActions={userActions} />
</div>
</div>
<div id="scene" className="col-12 col-md-8" >
Expand All @@ -62,4 +62,4 @@ export const ReferenceExample = ({ editor, user, scene, referenceExample, refere
</div>
);

export default ReferenceExample;
export default ReferenceExample;
18 changes: 9 additions & 9 deletions src/components/structural/Footer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,39 @@ class Footer extends Component {
<footer>
<div className="row m-3 text-center" >
<div className="col-lg-4 d-flex">
<span><strong>MYR:</strong></span>
<span><strong>MYR:&nbsp;</strong></span>
<ul className="pl-2 list-inline">
<li className="pl-2 list-inline-item">
<a href="https://learnmyr.org/about/" target="_blank" rel="noopener noreferrer" className = "text-decoration-none">About</a>
<a href="https://learnmyr.org/about/" target="_blank" rel="noopener noreferrer" className="text-decoration-none">About</a>
</li>
<li className="pl-2 list-inline-item">
<a href="https://learnmyr.org/about/support/" target="_blank" rel="noopener noreferrer" className="text-decoration-none">Support</a>
</li>
<li className="pl-2 list-inline-item">
<a href="https://learnmyr.org/about/team/" target="_blank" rel="noopener noreferrer" className = "text-decoration-none">Team </a>
<a href="https://learnmyr.org/about/team/" target="_blank" rel="noopener noreferrer" className="text-decoration-none">Team</a>
</li>
<li className="pl-2 list-inline-item">
<a href="https://github.com/engaging-computing/MYR" target="_blank" rel="noopener noreferrer" className = "text-decoration-none">GitHub</a>
<a href="https://github.com/engaging-computing/MYR" target="_blank" rel="noopener noreferrer" className="text-decoration-none">GitHub</a>
</li>
</ul>
</div>
<div className="col-lg-4 d-none d-md-block text-center">
<div>© 2018 - {new Date().getFullYear()}<span>&nbsp;</span>
<a href="https://sites.uml.edu/engaging-computing/" target="_blank" rel="noopener noreferrer" className = "text-decoration-none">University of Massachusetts Lowell, Engaging Computing Group</a>
<a href="https://sites.uml.edu/engaging-computing/" target="_blank" rel="noopener noreferrer" className="text-decoration-none">University of Massachusetts Lowell, Engaging Computing Group</a>
</div>
</div>
<div className="col-sm-12 d-block d-md-none text-center">
<div>© 2018 - {new Date().getFullYear()}<br />
<a href="https://sites.uml.edu/engaging-computing/" target="_blank" rel="noopener noreferrer" className = "text-decoration-none">University of Massachusetts Lowell,<br />Engaging Computing Group</a>
<a href="https://sites.uml.edu/engaging-computing/" target="_blank" rel="noopener noreferrer" className="text-decoration-none">University of Massachusetts Lowell,<br />Engaging Computing Group</a>
</div>
</div>
<div className="col-lg-4">
<ul className=" list-inline text-lg-right">
<ul className=" list-inline text-lg-end">
<li className="pl-2 list-inline-item">
<a href="https://learnmyr.org/about/privacy/" target="_blank" rel="noopener noreferrer" className = "text-decoration-none">Privacy Policy</a>
<a href="https://learnmyr.org/about/privacy/" target="_blank" rel="noopener noreferrer" className="text-decoration-none">Privacy Policy</a>
</li>
<li className="pl-2 list-inline-item">
<a href="https://learnmyr.org/about/tos/" target="_blank" rel="noopener noreferrer" className = "text-decoration-none">Terms of Service</a>
<a href="https://learnmyr.org/about/tos/" target="_blank" rel="noopener noreferrer" className="text-decoration-none">Terms of Service</a>
</li>
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/structural/View.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ class View extends Component {
raycaster="objects:.raycastable"
position="0 0 -1"
geometry="primitive: ring; radiusInner: 0.02; radiusOuter: 0.03;"
material={this.displayCursor} />
material={this.displayCursor()} />
</a-camera>
</a-entity>
);
Expand All @@ -337,7 +337,7 @@ class View extends Component {
raycaster="objects:.raycastable"
position="0 0 -1"
geometry="primitive: ring; radiusInner: 0.02; radiusOuter: 0.03;"
material={this.displayCursor} />
material={this.displayCursor()} />
</a-camera>
</a-entity>
);
Expand Down
20 changes: 20 additions & 0 deletions src/components/structural/header/Header.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import * as layoutTypes from "../../../constants/LayoutTypes.js";

import {
Button,
ButtonBase,
Icon,
MenuItem,
Tooltip,
Expand All @@ -35,6 +36,15 @@ const exitBtnStyle = {
right: 0,
};

const resetButtonStyle = {
top: 2,
paddingLeft: 10,
paddingRight: 10,
color: "white",
opacity: 1

};

/**
* React component class for the header
*/
Expand Down Expand Up @@ -798,6 +808,16 @@ class Header extends Component {
<Icon className="material-icons">save</Icon>
</IconButton>
</Tooltip>
<Tooltip title="reset position" placement="bottom-start">
<ButtonBase
id="reset-btn"
onClick={() => this.props.sceneActions.setCamera(0, 1.6, 3)}
className="header-btn d-none d-md-block"
style= {resetButtonStyle}
disabled={referenceMode}>
<Icon className ="material-icons">settings_backup_restore</Icon>
</ButtonBase>
</Tooltip>
<ProjectView
deleteFunc={this.props.projectActions.deleteProj}
userProjs={this.props.projects.userProjs}
Expand Down
3 changes: 2 additions & 1 deletion src/components/structural/header/ProjectView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,8 @@ class Project extends React.Component {
</div>}
{this.state.value === "b" &&
<div id="project-list" style={{ marginTop: 0, overflow: "scroll" }}>
<div className="row" id="sample-proj" style={{ width: "100%" }}>
<div className="row mt-2" id="sample-proj" style={{ width: "100%" }}>
<p>Want to see <b>YOUR</b> scenes here? Submit them using this <a href="https://docs.google.com/forms/d/e/1FAIpQLSfAgmEobjFWAaiAvkCISLgIv1i4OH6jgUGLqtcZ4ktPIXc1Ew/viewform" rel="noreferrer" target="_blank">form!</a></p>
{
exampleProjs.sort(this.projectSort).map(proj => {
return this.helper(proj, false);
Expand Down
3 changes: 0 additions & 3 deletions src/components/structural/header/SceneConfigMenu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,9 +662,6 @@ class ConfigModal extends Component {
<div className="col-6">
<this.updateMoveSpeed />
</div>
<div className="col-6">
<this.resetPosition />
</div>
{this.state.displaySkyColorPicker
?
<div id="color-popover">
Expand Down
11 changes: 6 additions & 5 deletions src/css/CourseSelect.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
color: #333;
}

.course-listing p:hover {
color: #000;
.course-listing a {
text-decoration: none;
}

.course-listing a:hover {
text-decoration: none;

.course-listing a:hover h4 {
text-decoration: underline;
color: blue;
}

Expand All @@ -32,4 +33,4 @@ div#courses {
#lesson fieldset {
height: 16vh;
margin: 0;
}
}
4 changes: 2 additions & 2 deletions src/myr/reference.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -640,13 +640,13 @@ const animations = [
{
name: "grow",
parameters: [{ type: "string", name: "elementID" }],
description: <span>The grow function scales the element by a [magnitude] multiplier in the x, y, z components.</span>,
description: <span>The grow function scales the element by a [magnitude] multiplier in the x, y, z components. Use the setMagnitude function before passing the grow function.</span>,
example: "grow"
},
{
name: "shrink",
parameters: [{ type: "string", name: "elementID" }],
description: <span>The shrink function scales the element down by the inverse of the magnitude in the x, y, z components.</span>,
description: <span>The shrink function scales the element down by the inverse of the magnitude in the x, y, z components. Use the setMagnitude function before passing the shrink function and set the magnitude to any value other than 1 to see the animation.</span>,
example: "shrink"
},
{
Expand Down

0 comments on commit d13e29a

Please sign in to comment.