diff --git a/.gitignore b/.gitignore index 2d3f21f..87bc6c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,41 +1,48 @@ -# Code editors and IDE files -.vscode/ -.idea/ - -# WSL for Windows -*Zone.Identifier - -# macOS -.DS_Store - -# dependencies +### Hosted gitgnore node_modules -/.pnp -.pnp.js +public +src +studio -# testing -coverage +#### Devlopment gitignore +# # Code editors and IDE files +# .vscode/ +# .idea/ -# production -build -dist +# # WSL for Windows +# *Zone.Identifier -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local +# # macOS +# .DS_Store -# sass -.sass-cache/ -*.css.map -*.sass.map -*.scss.map +# # dependencies +# node_modules +# /.pnp +# .pnp.js -# eslint -.eslintcache +# # testing +# coverage -npm-debug.log* -yarn-debug.log* -yarn-error.log* +# # production +# build +# dist + +# # misc +# .DS_Store +# .env.local +# .env.development.local +# .env.test.local +# .env.production.local + +# # sass +# .sass-cache/ +# *.css.map +# *.sass.map +# *.scss.map + +# # eslint +# .eslintcache + +# npm-debug.log* +# yarn-debug.log* +# yarn-error.log* diff --git a/CNAME b/CNAME deleted file mode 100644 index 1d2a2b6..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -www.potentiarobotics.com diff --git a/README.md b/README.md index c6dfbdf..97d5ccf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # website - + Source for TJHRC's website built with Sanity and React. # Setup @@ -22,6 +22,38 @@ yarn start ``` And you should see the website load and show up in your browser, at the address https://http://localhost:3000/. +# Creating new branches +Make sure to replace +``` +"start": "serve -s build/" +``` + with these four lines: +``` +"start": "react-scripts start", +"build": "react-scripts build", +"test": "react-scripts test", +"eject": "react-scripts eject" +``` when creating a branch in the scripts section of package.json + +# Committing to branches +When committing to a side branch make sure to uncomment everything below "Devlopment gitignore" and comment everything under the "Hosted gitignore" heading. + +# Committing to master +When committing to a master branch make sure to uncomment everything below "Hosted gitignore" and comment everything under the "Devlopment gitignore" heading. + +Run ```yarn run build``` in the console + +Also replace +``` +"start": "react-scripts start", +"build": "react-scripts build", +"test": "react-scripts test", +"eject": "react-scripts eject" +``` with +``` +"start": "serve -s build/" +``` in the scripts section of package.json + ## Available Scripts In the project directory, you can run: diff --git a/build/asset-manifest.json b/build/asset-manifest.json new file mode 100644 index 0000000..ddc2c54 --- /dev/null +++ b/build/asset-manifest.json @@ -0,0 +1,43 @@ +{ + "files": { + "main.css": "/static/css/main.6342b2aa.chunk.css", + "main.js": "/static/js/main.5937dde3.chunk.js", + "main.js.map": "/static/js/main.5937dde3.chunk.js.map", + "runtime-main.js": "/static/js/runtime-main.2400042d.js", + "runtime-main.js.map": "/static/js/runtime-main.2400042d.js.map", + "static/css/2.6390442a.chunk.css": "/static/css/2.6390442a.chunk.css", + "static/js/2.1b4ba0e4.chunk.js": "/static/js/2.1b4ba0e4.chunk.js", + "static/js/2.1b4ba0e4.chunk.js.map": "/static/js/2.1b4ba0e4.chunk.js.map", + "index.html": "/index.html", + "static/css/2.6390442a.chunk.css.map": "/static/css/2.6390442a.chunk.css.map", + "static/css/main.6342b2aa.chunk.css.map": "/static/css/main.6342b2aa.chunk.css.map", + "static/js/2.1b4ba0e4.chunk.js.LICENSE.txt": "/static/js/2.1b4ba0e4.chunk.js.LICENSE.txt", + "static/media/0001.0d0d8dab.jpg": "/static/media/0001.0d0d8dab.jpg", + "static/media/0002.0b2733d8.jpg": "/static/media/0002.0b2733d8.jpg", + "static/media/0003.4ab744ab.jpg": "/static/media/0003.4ab744ab.jpg", + "static/media/Adi.0b1d1ea5.PNG": "/static/media/Adi.0b1d1ea5.PNG", + "static/media/Aileen.6991dc5c.PNG": "/static/media/Aileen.6991dc5c.PNG", + "static/media/Jason.8e6c1bd4.PNG": "/static/media/Jason.8e6c1bd4.PNG", + "static/media/Kedar.a23f2f06.PNG": "/static/media/Kedar.a23f2f06.PNG", + "static/media/Mayuka.6b4c654f.PNG": "/static/media/Mayuka.6b4c654f.PNG", + "static/media/Python_BootCamp.365d4311.pdf": "/static/media/Python_BootCamp.365d4311.pdf", + "static/media/Ram.3b1fb1d9.PNG": "/static/media/Ram.3b1fb1d9.PNG", + "static/media/Rushil.b3c81117.PNG": "/static/media/Rushil.b3c81117.PNG", + "static/media/Sai.cb78b584.PNG": "/static/media/Sai.cb78b584.PNG", + "static/media/Shahzad.1270f1d1.PNG": "/static/media/Shahzad.1270f1d1.PNG", + "static/media/aboutlogo.c28a7eae.PNG": "/static/media/aboutlogo.c28a7eae.PNG", + "static/media/bootstrap-icons.css": "/static/media/bootstrap-icons.cc252f2c.woff", + "static/media/bot2.d972cd79.png": "/static/media/bot2.d972cd79.png", + "static/media/logo_tr_bg.baf63c10.png": "/static/media/logo_tr_bg.baf63c10.png", + "static/media/olympian_hero.8a17602f.png": "/static/media/olympian_hero.8a17602f.png", + "static/media/olympian_waving.855e4c67.png": "/static/media/olympian_waving.855e4c67.png", + "static/media/team_picture.5256ab36.png": "/static/media/team_picture.5256ab36.png" + }, + "entrypoints": [ + "static/js/runtime-main.2400042d.js", + "static/css/2.6390442a.chunk.css", + "static/js/2.1b4ba0e4.chunk.js", + "static/css/main.6342b2aa.chunk.css", + "static/js/main.5937dde3.chunk.js" + ] +} \ No newline at end of file diff --git a/build/favicon.ico b/build/favicon.ico new file mode 100644 index 0000000..b234735 Binary files /dev/null and b/build/favicon.ico differ diff --git a/build/index.html b/build/index.html new file mode 100644 index 0000000..8dc99d5 --- /dev/null +++ b/build/index.html @@ -0,0 +1 @@ +