Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adler #72

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4c8835e
update docs and add template file
AidanNelson Jan 22, 2021
5810d7c
minor fix
AidanNelson Jan 22, 2021
62ea1f8
Merge pull request #1 from yorb-club/doc-changes
AidanNelson Jan 22, 2021
61ccb25
adds getStartingPosition which checks query params
AidanNelson Jan 22, 2021
99ba544
press p to get url
AidanNelson Jan 22, 2021
62bd7eb
minor fixes
AidanNelson Jan 22, 2021
1aea2af
add modal for link
AidanNelson Jan 25, 2021
f31489f
Merge pull request #2 from yorb-club/query-params
AidanNelson Jan 25, 2021
0c3cfdf
init - can't trigger this.createYorbProjectionScreens?
billythemusical Feb 3, 2021
15d6f4f
this.projectionScreens.createYorbProjectionScreens()
billythemusical Feb 3, 2021
837cd70
screen working
billythemusical Feb 3, 2021
e237d63
added stage option to performance screen, removed old screensaver8.mpg
billythemusical Feb 4, 2021
09cdf0e
100 Days Gallery (#3) + Place tool
augustluhrs Feb 4, 2021
46c147c
longer screen audio rolloff, fixed duplicate screens
billythemusical Feb 4, 2021
eca805a
Merge branch 'main' into TNO-performance-screen
billythemusical Feb 4, 2021
81d09f7
Merge pull request #5 from yorb-club/TNO-performance-screen
billythemusical Feb 4, 2021
15bd287
Update CONTRIBUTING.md
AidanNelson Feb 12, 2021
869dced
TNO and Days Gallery Hotfix (#8)
augustluhrs Feb 12, 2021
fd089ad
Update CONTRIBUTING.md
AidanNelson Feb 12, 2021
437d8e5
add sandbox
AidanNelson Feb 17, 2021
a76525a
Merge pull request #9 from yorb-club/workshop-changes
AidanNelson Feb 17, 2021
6e3163e
fixed empty gallery console errors -- two if statements for place and…
augustluhrs Feb 19, 2021
1893135
Revisions to YORB for use as Tisch Adler Rehearsal Space
brandonroots Mar 26, 2021
78b33f2
Update sandbox.js
brandonroots Apr 21, 2021
8d02766
Revision to sandbox
brandonroots Apr 21, 2021
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
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,9 @@ public/js/bundle.js
images/project_thumbnails
.cache
dist/
utilities/getProjectThumbnails/projectThumbnails
utilities/getProjectThumbnails/projectThumbnails
utilities/100DaysScripts/package-lock.json
**/instagram-scraper*
src/assets/images/100Days
utilities/100DaysScripts/*.log
utilities/100DaysScripts/latestScrapes.txt
2 changes: 1 addition & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"trailingComma": "es5",
"tabWidth": 4,
"semi": false,
"semi": true,
"singleQuote": true,
"printWidth": 200
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![image of 3D environment with one person in it](docs/images/yorb-2020.png "YORB 2020")
![image of 3D environment with many people moving around](docs/images/winter-show-2020.png "YORB 2020")

## About

Expand Down
16 changes: 11 additions & 5 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ If you want to run the code locally, you can do so against either the ITP Yorb s

1. Clone or fork the repository and download a local copy:
```bash
git clone https://github.com/AidanNelson/YORB2020.git
git clone https://github.com/yorb-club/YORB2020.git
```
2. Navigate into the repository and install dependencies:
```bash
Expand Down Expand Up @@ -44,14 +44,20 @@ If you want to run the code locally, you can do so against either the ITP Yorb s
cd server
npm install
```
4. Change directory again back to the root directory of the project and start the server:
4. Create a new file in the `/server` folder called `.env` and copy the contents of `example.env` into it. Adjust the `PRODUCTION_IP` to reflect your computer's IP address on the local network:
```
PROJECT_DATABASE_URL = 'https://itp.nyu.edu/projects/public/projectsJSON_ALL.php?venue_id=164&room_id=1'
PRODUCTION_IP="192.168.0.107"
PRODUCTION_PORT="3000"
```
5. Change directory again back to the root directory of the project and start the server:
```bash
cd ..
npm run start-server
```
5. In a separate terminal window (in the root directory of the project), start the build system (same as step #4 from above):
6. In a separate terminal window (in the root directory of the project), start the build system (same as step #4 from above):
```bash
npm run watch
```
6. Navigate your browser window to http://localhost:1234. This page should now connect to your backend server at http://localhost:3000.
7. Note that you may need to restart this local development server / build system from time to time to ensure that your changes are being reflected in the browser!
7. Navigate your browser window to http://localhost:1234. This page should now connect to your backend server at http://localhost:3000.
8. Note that you may need to restart this local development server / build system from time to time to ensure that your changes are being reflected in the browser!
Binary file added docs/images/winter-show-2020.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading