Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
2f17275
added file to give site
Joyboy97 Oct 31, 2022
c806607
ignored any in games.ts
Joyboy97 Oct 31, 2022
9220ac1
vicbranch start
Joyboy97 Oct 31, 2022
15e1604
add switch and push
Oct 31, 2022
4bd860b
Merge pull request #1 from emba00/andrewBranch
andrewgeraci Oct 31, 2022
5f6b7a5
deploy
Oct 31, 2022
039aa9d
Merge pull request #2 from emba00/andrewBranch
andrewgeraci Oct 31, 2022
ad1523c
pushin pushin
emba00 Oct 31, 2022
35810de
pushin pushin
emba00 Nov 1, 2022
f566e4e
pushin pushin
emba00 Nov 1, 2022
426b741
changed the drag boxes
emba00 Nov 1, 2022
1c10faf
Merge pull request #3 from emba00/manny
emba00 Nov 1, 2022
f07bc6f
each box cahnges the name need this fixed
Joyboy97 Nov 1, 2022
5ce6404
index fixes
Joyboy97 Nov 1, 2022
c8da68b
zoere help w token
emba00 Nov 1, 2022
2085e14
Merge pull request #4 from emba00/manny
emba00 Nov 1, 2022
1eb4d30
vic deploy
Joyboy97 Nov 1, 2022
dd7c668
vic was here deploy
Joyboy97 Nov 1, 2022
003ede0
vic wasnt here deploy
Joyboy97 Nov 1, 2022
1e107a5
added photos for tools and blank car
Nov 3, 2022
e440638
Merge branch 'main' into andrewBranch
andrewgeraci Nov 3, 2022
eb6deb7
Merge pull request #5 from emba00/andrewBranch
andrewgeraci Nov 3, 2022
a57df06
I think i have a start on the save state of car
emba00 Nov 3, 2022
0be1fd8
drag and drop my menu
Joyboy97 Nov 4, 2022
c164336
merged main 11/4/2022
Joyboy97 Nov 4, 2022
01cb40d
merged andrew to vic 11/4/2022
Joyboy97 Nov 4, 2022
c37492e
change car color button
Nov 7, 2022
e34a00b
Merge branch 'main' of https://github.com/emba00/final-project-start …
Nov 7, 2022
3c2cd14
change car color button
Nov 7, 2022
26d96b7
Merge pull request #6 from emba00/andrewBranch
andrewgeraci Nov 7, 2022
d195aec
origin main
Joyboy97 Nov 8, 2022
b91b583
fixing car space
emba00 Nov 8, 2022
064c9f6
should deploy
emba00 Nov 8, 2022
bf21aee
deploy plz
emba00 Nov 8, 2022
2391a0d
trying to commit new branch changes
Joyboy97 Nov 8, 2022
3564d4b
deploy plzzz
emba00 Nov 8, 2022
47b6aa0
trying to deploy
emba00 Nov 8, 2022
8348085
should deploy
emba00 Nov 8, 2022
fe0ca85
ok should actually deploy
emba00 Nov 8, 2022
8b24b55
yml fixes
Joyboy97 Nov 8, 2022
e61b057
Merge pull request #1 from UD-CISC275-S22/ogrepo
Joyboy97 Nov 8, 2022
4c22db4
started on getting tools interacting w/ car
emba00 Nov 9, 2022
8ead7f1
trying to work
emba00 Nov 9, 2022
0ef5773
change background
Nov 11, 2022
f64d0b0
change background
Nov 11, 2022
1e16b35
Merge pull request #8 from emba00/andrewBranch
andrewgeraci Nov 11, 2022
4bc7fa7
made image folder
Nov 11, 2022
ccfe2d3
Merge pull request #9 from emba00/andrewBranch
andrewgeraci Nov 11, 2022
3231548
add pic to game
Joyboy97 Nov 15, 2022
bb60758
workin on car squares
emba00 Nov 15, 2022
1e6b8bc
Merge branch 'main' into mannycarsave2
emba00 Nov 15, 2022
cdd4db7
Merge pull request #10 from emba00/mannycarsave2
emba00 Nov 15, 2022
81f8a5d
car and carspace stuff
emba00 Nov 15, 2022
476ba5f
layout stuff
emba00 Nov 15, 2022
d10cb1d
tryna add images
Joyboy97 Nov 15, 2022
c12b6b2
vic merge
Joyboy97 Nov 16, 2022
e6ed2ae
vicbranchmerge
Joyboy97 Nov 16, 2022
285d340
commmented out car space while merging please fix this
Joyboy97 Nov 16, 2022
ac89822
can drag and make new image
Joyboy97 Nov 17, 2022
dfcfeef
interesting main
Joyboy97 Nov 17, 2022
6454140
DRAG AND DROP WORKS
Joyboy97 Nov 17, 2022
46b9da7
was testing stuff
emba00 Nov 17, 2022
e9101b5
Car back
emba00 Nov 17, 2022
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
59 changes: 59 additions & 0 deletions .eslintrc.json.orig
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"env": {
"browser": true,
"es2021": true,
"node": true
},
"settings": {
"react": {
"version": "detect"
}
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"prettier"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 12,
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint", "prettier"],
"rules": {
"prettier/prettier": [
"error",
{
"endOfLine": "auto"
}
],
"no-extra-parens": [
"warn",
"all",
{
"nestedBinaryExpressions": false,
"returnAssign": false,
<<<<<<< HEAD
"enforceForArrowConditionals": false
}
],
"brace-style": ["error", "1tbs"],
"indent": ["error", 4],
"quotes": ["error", "double"],
=======
"enforceForArrowConditionals": false,
"ignoreJSX": "all"
}
],
"brace-style": ["error", "1tbs"],
"indent": ["error", 4, { "SwitchCase": 1 }],
"quotes": ["error", "double", { "avoidEscape": true }],
>>>>>>> ad6c400 (Initial commit)
"semi": ["error", "always"]
}
}
51 changes: 51 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# .gitattributes snippet to force users to use same line endings for project.
#
# Handle line endings automatically for files detected as text
# and leave all files detected as binary untouched.
* text=auto

#
# The above will handle all files NOT found below
# https://help.github.com/articles/dealing-with-line-endings/
# https://github.com/Danimoth/gitattributes/blob/master/Web.gitattributes



# These files are text and should be normalized (Convert crlf => lf)
*.php text
*.css text
*.js text
*.json text
*.htm text
*.html text
*.xml text
*.txt text
*.ini text
*.inc text
*.pl text
*.rb text
*.py text
*.scm text
*.sql text
.htaccess text
*.sh text
*.svg text

# These files are binary and should be left untouched
# (binary is a macro for -text -diff)
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.ico binary
*.mov binary
*.mp4 binary
*.mp3 binary
*.flv binary
*.fla binary
*.swf binary
*.gz binary
*.zip binary
*.7z binary
*.ttf binary
*.pyc binary
60 changes: 60 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- id: get-repo-values
run: |
url=https://$(echo "${{github.repository}}" | sed "s/\//.github.io\//")
echo "::set-output name=url::$url"
- name: Update package.json homepage
uses: jossef/action-set-json-field@v1
with:
file: package.json
field: homepage
value: ${{ steps.get-repo-values.outputs.url }}
- run: npm ci

#- run: npm run lint
- run: npm run test -- --coverage |& tee ./public/test_report.txt

- run: echo "<html><head><meta http-equiv='refresh' content='0; URL=${{github.server_url}}/${{github.repository}}' /></head><body>Redirecting to repository</body></html>" > ./public/github.html
- name: GitInspector
run: |
git clone https://github.com/jpwhite3/gitinspector.git
git clone ${{github.server_url}}/${{github.repository}} original-src/
python ./gitinspector/gitinspector.py ./original-src/ -f tsx,ts --grading -F html -x ./gitinspector > ./public/git_report.html

- run: npm run build --if-present

- name: Deploy
run: |
git config --global user.name ${user_name}
git config --global user.email ${user_email}
git remote set-url origin https://${github_token}@github.com/${repository}
npm run deploy
env:
user_name: "github-actions[bot]"
user_email: "github-actions[bot]@users.noreply.github.com"
github_token: ${{ secrets.GH_TOKEN }}
repository: ${{ github.repository }}
57 changes: 57 additions & 0 deletions .github/workflows/node.js_BACKUP_2640.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- id: get-repo-values
run: |
url=https://$(echo "${{github.repository}}" | sed "s/\//.github.io\//")
echo "::set-output name=url::$url"
- name: Update package.json homepage
uses: jossef/action-set-json-field@v1
with:
file: package.json
field: homepage
value: ${{ steps.get-repo-values.outputs.url }}
- run: npm ci

#- run: npm run lint
- run: npm run test -- --coverage |& tee ./public/test_report.txt
- run: echo "<html><head><meta http-equiv='refresh' content='0; URL=${{github.server_url}}/${{github.repository}}' /></head><body>Redirecting to repository</body></html>" > ./public/github.html
- name: GitInspector
run: |
git clone https://github.com/jpwhite3/gitinspector.git
git clone ${{github.server_url}}/${{github.repository}} original-src/
python ./gitinspector/gitinspector.py ./original-src/ -f tsx,ts --grading -F html -x ./gitinspector > ./public/git_report.html
- run: npm run build --if-present
- name: Deploy
run: |
git config --global user.name ${user_name}
git config --global user.email ${user_email}
git remote set-url origin https://${github_token}@github.com/${repository}
npm run deploy
env:
user_name: "github-actions[bot]"
user_email: "github-actions[bot]@users.noreply.github.com"
github_token: ${{ secrets.GH_TOKEN }}
repository: ${{ github.repository }}
Empty file.
52 changes: 52 additions & 0 deletions .github/workflows/node.js_LOCAL_2640.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- id: get-repo-values
run: |
url=https://$(echo "${{github.repository}}" | sed "s/\//.github.io\//")
echo "::set-output name=url::$url"
- name: Update package.json homepage
uses: jossef/action-set-json-field@v1
with:
file: package.json
field: homepage
value: ${{ steps.get-repo-values.outputs.url }}
- run: npm ci
#- run: npm run lint
- run: npm run test -- --coverage |& tee ./public/test_report.txt
- run: echo "<html><head><meta http-equiv='refresh' content='0; URL=${{github.server_url}}/${{github.repository}}' /></head><body>Redirecting to repository</body></html>" > ./public/github.html
- run: npm run build --if-present

- name: Deploy
run: |
git config --global user.name ${user_name}
git config --global user.email ${user_email}
git remote set-url origin https://${github_token}@github.com/${repository}
npm run deploy
env:
user_name: "github-actions[bot]"
user_email: "github-actions[bot]@users.noreply.github.com"
github_token: ${{ secrets.GH_TOKEN }}
repository: ${{ github.repository }}
57 changes: 57 additions & 0 deletions .github/workflows/node.js_REMOTE_2640.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
- id: get-repo-values
run: |
url=https://$(echo "${{github.repository}}" | sed "s/\//.github.io\//")
echo "::set-output name=url::$url"
- name: Update package.json homepage
uses: jossef/action-set-json-field@v1
with:
file: package.json
field: homepage
value: ${{ steps.get-repo-values.outputs.url }}
- run: npm ci
- run: npm run lint
- run: npm run test -- --coverage |& tee ./public/test_report.txt
- run: echo "<html><head><meta http-equiv='refresh' content='0; URL=${{github.server_url}}/${{github.repository}}' /></head><body>Redirecting to repository</body></html>" > ./public/github.html
- name: GitInspector
run: |
git clone https://github.com/jpwhite3/gitinspector.git
git clone ${{github.server_url}}/${{github.repository}} original-src/
python ./gitinspector/gitinspector.py ./original-src/ -f tsx,ts --grading -F html -x ./gitinspector > ./public/git_report.html
- run: npm run build --if-present

- name: Deploy
run: |
git config --global user.name ${user_name}
git config --global user.email ${user_email}
git remote set-url origin https://${github_token}@github.com/${repository}
npm run deploy
env:
user_name: "github-actions[bot]"
user_email: "github-actions[bot]@users.noreply.github.com"
github_token: ${{ secrets.GH_TOKEN }}
repository: ${{ github.repository }}
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
<<<<<<< HEAD
# React DND TypeScript Starter Repo for CISC275 Fall 2022

Hello! This repository has been pre-configured with eslint and gh-pages to automatically deploy your app when you push to the main branch.

Fork, and execute necessary setup steps.

Watch this space for additional project requirements.
=======
# React TypeScript Starter Repo

Hello! This repository has been pre-configured with eslint and gh-pages to automatically deploy your app when you push to the main branch.

You will, however, need to finish setting up the deployment.

### 1. Generate a personal access token

1. Click on your picture -> `settings` in the top right of Github.
2. Then, scroll to `Developer Settings` and click `Personal access tokens`
3. Generate a new token with `repo` access and no expiration date.
4. Make sure you copy the created token as you will not be able to see it after this.

### 2. Add a secret to the forked repo

Back in this repository, go to `settings` -> `secrets` -> `Actions` and click the `New repository secret` button in the topright.

Name the secret "GH_TOKEN" and paste in the token you copied in the previous step.
>>>>>>> ad6c400 (Initial commit)
Loading