Move code

[webdev03]

Moves the package.json and package-lock to the root so that you can instantly run npm install and all npm commands as soon as you open your IDE/editor and also to enable automatic Prettier.

Resolves #44

[jdev082]

conflicts

[webdev03]

Ah, there's a complex conflict now, can you just delete that app/package.json it might be easier?

[hello-smile6]

Ah, there's a complex conflict now, can you just delete that app/package.json it might be easier?

On it.

[webdev03]

Wait, doesn't JaydenDev only have access to delete the app/package.json ?

[jdev082]

there is no need to open the files to /

[jdev082]

*move files to

[webdev03]

Ok

[webdev03]

I thought it would be good to make the Prettier work in VS Code that's why

[hello-smile6]

there is no need to open the files to /

Actually, there is. Stop being so stubborn.

[webdev03]

I'm the one being stubborn, sorry

[jdev082]

how about all the code just be moved into the main directory I'm doing this right now.

[hello-smile6]

how about all the code just be moved into the main directory I'm doing this right now.

That sounds good.

[webdev03]

That might clutter it up...

[hello-smile6]

That might clutter it up...

But it'd make npm install easier.

[webdev03]

npm install already works with this PR

[jdev082]

it doesnt let me anyway

To https://github.com/JaydenDev/freecat
 ! [rejected]        main -> main (non-fast-forward)
error: failed to push some refs to 'https://github.com/JaydenDev/freecat'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

[webdev03]

@JaydenDev run git pull first

[jdev082]

didnt even let me run that i'll just move the files

[jdev082]

i moved package.json and package-lock.json to /

[webdev03]

i moved package.json and package-lock.json to /

You just broke it I think... I can help..

[webdev03]

@JaydenDev can you try to run Freecat with the current main branch?

[hello-smile6]

@JaydenDev can you try to run Freecat with the current main branch?

@webdev03 Successful program execution on Windows 10.

Device name localhost
Full device name    localhost
Processor   Intel(R) Xeon(R) CPU E5-2697 v4 @ 2.30GHz   2.29 GHz  (2 processors)
Installed RAM   10.0 GB
Device ID   ********-****-****-****-***********
Product ID  *****-*****-*****-*****
System type 64-bit operating system, x64-based processor
Pen and touch   No pen or touch input is available for this display

[webdev03]

Doesn't work, did you pull the latest changes and are using JaydenDev/freecat

[hello-smile6]

Doesn't work, did you pull the latest changes and are using JaydenDev/freecat

Merge my main branch, it works.

git pull https://github.com/hello-smile6/freecat.git

[webdev03]

:confused:

[hello-smile6]

49 adds onto this PR.