Updates to Install and Rules pages #47

JasonHoku · 2020-05-24T05:02:52Z

Compiled from edenxi.com and discord from 5/22/20.

Some formatting changes and info directly added to Install & Rules and some added to config for now

…cord from 5/22/20

JasonHoku · 2020-05-24T05:03:32Z

Ino said I was on an older base so the conflicts should be good in this PR instead

JasonHoku · 2020-05-24T05:08:01Z

Oh wait, maybe I just am not running prettier on this before committing? @_@;
Ill get this figured out soon I promise lol

also ran npm update for vulnerabilities upgrade typescript and node

JasonHoku · 2020-05-24T08:14:02Z

Yesss, I did it!!! xD

InoUno · 2020-05-24T12:20:30Z

Hmm, looks like some formatting has been applied to all files and not just JS/TS ones, which is what the format command should only be targeting.

Did you just run npm run format, or did you also try some other things that might have caused JSON/CSS files to be formatted as well?
We probably want to format those too eventually (better to do in separate PR), I'm just curious if there might be some setup differences that makes the format command hit JSON/CSS files as well for you.

JasonHoku · 2020-05-25T06:23:26Z

Hmm.. I believe I ran update, upgrade and run-script format as well in this PR, I can rebase and re-pr without running those.

InoUno · 2020-05-25T09:27:28Z

Running npm update or npm upgrade should only really be done if there's a specific need to update any/all packages. They shouldn't be needed for regular PRs. But it's fine for now, we can keep the updated version in this PR.

Doing those things shouldn't have formatted all the rest of the files though. Gonna try to figure it out with you via discord.

This reverts commit e815f00.

InoUno · 2020-05-25T13:54:29Z

Looks good now regarding the files changed (could do without the package updates, but that's fine for now).

I'll let @slassen review the text/content changes.

InoUno · 2020-05-27T17:32:46Z

I took the liberty of restoring the package files, so they won't cause a lot of conflicts with the other PRs.

…login

… stub out actions if needed.

…omponents.

slassen · 2020-05-28T01:46:59Z

I like the last updated timestamp on terms and conditions. Maybe we can copy this for each section?

I would rather have some sort of table for the allowed/disallowed plugins instead of the way it's set up in this PR.

I would rather have something in italics instead of another numbered bullet point with a ^ signaling that it relates to the above point.

Please use the previous elements and styling on Discord rules.

For the "Punishments" section please use a semantic table.

…-Rules-info-updates

This reverts commit de9b674.

bkesecker · 2020-05-28T18:32:47Z

fixes #5

bkesecker · 2020-05-28T18:48:45Z

client/src/components/install.jsx

@@ -8,7 +8,7 @@ function install(props) {
  const { info } = props;

  return (
-    <Container>
+    <>


Probably invalid XML. Maybe just comment out? Can clients override style "display: none"?

Man.. I had addon interference in my VSC... really messed me up for a minute there lol but then I discovered how to use Prettier, this next PR should fix any formatting issues.

Can clients override style "display: none"?

I don't think so, when node.js compiles everything it removes all comment lines in the final client .js build files to make it very efficient for production.

…e can copy this for each section? [x * This might take some work, tidied a little for now]I would rather have some sort of table for the allowed/disallowed plugins instead of the way it's set up in this PR. [x]I would rather have something in italics instead of another numbered bullet point with a ^ signaling that it relates to the above point. [x]Please use the previous elements and styling on Discord rules. [x]For the "Punishments" section please use a semantic table.

…-Rules-info-updates

bkesecker · 2020-05-28T20:22:21Z

ran prettier

Did this change all the double quotes to single quotes?

JasonHoku · 2020-05-28T20:25:56Z

ran prettier

Did this change all the double quotes to single quotes?

Maybe my prettier config isn't setup right?

JasonHoku · 2020-05-28T20:26:38Z

ran prettier

Did this change all the double quotes to single quotes?

Maybe my prettier config isn't setup right?

Looking into it.

bkesecker · 2020-05-28T20:31:30Z

Looks like the other way around. Tough to review with so many changes.

JasonHoku · 2020-05-28T20:39:43Z

Hmm.. I guess that it was a default setting, I may have reset some prettier options in VSC ?

I did find a fix for the single quote replace and I will undo that change now.

bkesecker · 2020-05-28T21:00:43Z

I did find a fix for the single quote replace and I will undo that change now.

Thank you. Will need to merge with develop to resolve conflicts.

JasonHoku · 2020-05-28T22:10:40Z

I was able to choose to force either double quote or single quotes with prettier but I couldn't get it to run without interfering..
pretty sure this article is whats wrong with end right now, but Ill have to pick back up on it later tonight for now.

…-&-Rules-info-updates

JasonHoku · 2020-05-29T06:02:16Z

I realllly hope I did this right >< I possibly should have changed my merge order slightly but I resolved the conflicts manually which looked like the login-fix pr branch didn't get applied to this branch after some of my reverts and merges, but we should be ready to roll now. Thanks everyone for the patience while I get up and running with git :P

slassen · 2020-05-29T07:19:37Z

No problem. I’m sure you’re almost there! I think it would probably be best if you copied just the files of your changes you wanted to make to your desktop then switch to the develop branch and make a new branch/PR. Additionally, please make sure to review and address the points in my previous comment.

JasonHoku · 2020-05-29T08:06:16Z

No problem. I’m sure you’re almost there! I think it would probably be best if you copied just the files of your changes you wanted to make to your desktop then switch to the develop branch and make a new branch/PR. Additionally, please make sure to review and address the points in my previous comment.

I am so into that idea. This one has gotten a bit messy ^^;

Updates to Install and Rules pages , compiled from edenxi.com and dis…

2d9226d

…cord from 5/22/20

JasonHoku added 2 commits May 23, 2020 22:03

main pr: updates to install and rules

14a9893

also ran npm update for vulnerabilities upgrade typescript and node

applied npm run format *

e815f00

Don't use /public as static path for serving files

e6bd8cf

JasonHoku added 2 commits May 25, 2020 00:24

Revert "applied npm run format *"

9dece20

This reverts commit e815f00.

resolved overformatting issue from previous commit

f54e697

danny-vvv and others added 3 commits May 25, 2020 19:56

Temporarily hide the login/register tools.

42a3add

fixed install page that was reverted in last commit ^^;

de9b674

Restore original package files

3529749

danny-vvv added 3 commits May 27, 2020 21:00

Merge commit 'e6bd8cf2b47959fcaea3444f13524275a577fd77' into disable-…

a7cd5d6

…login

Add features config with account features disabled, and use config to…

d215936

… stub out actions if needed.

Use features config to dynamically show/hide login and registration c…

a44293a

…omponents.

JasonHoku added 3 commits May 27, 2020 18:10

Merge remote-tracking branch 'origin/fix/prod-path' into PR-Install-&…

5c0dccf

…-Rules-info-updates

Merge branch 'develop' into PR-Install-&-Rules-info-updates

e209c3c

Revert "fixed install page that was reverted in last commit ^^;"

30fd728

This reverts commit de9b674.

bkesecker suggested changes May 28, 2020

View reviewed changes

JasonHoku added 3 commits May 28, 2020 09:47

ran prettier :P

5fe4333

Merge remote-tracking branch 'origin/disable-login' into PR-Install-&…

370a6cc

…-Rules-info-updates

JasonHoku added 5 commits May 28, 2020 19:27

fix for install/rules pr

e8efe24

Restored quote formatting error caused by overzealous vscode plugin.

0ef8104

Fixed formatting errors caused by overzealous vsc addon.

10618bc

Merge remote-tracking branch 'origin/Branch_30fd728e' into PR-Install…

a5e6265

…-&-Rules-info-updates

Merge branch 'develop' into PR-Install-&-Rules-info-updates

3827d23

JasonHoku closed this May 29, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updates to Install and Rules pages #47

Updates to Install and Rules pages #47

JasonHoku commented May 24, 2020

JasonHoku commented May 24, 2020

JasonHoku commented May 24, 2020

JasonHoku commented May 24, 2020

InoUno commented May 24, 2020

JasonHoku commented May 25, 2020

InoUno commented May 25, 2020

InoUno commented May 25, 2020 •

edited

Loading

InoUno commented May 27, 2020 •

edited

Loading

slassen commented May 28, 2020

bkesecker commented May 28, 2020

bkesecker May 28, 2020

JasonHoku May 28, 2020

JasonHoku May 28, 2020

bkesecker commented May 28, 2020

JasonHoku commented May 28, 2020

JasonHoku commented May 28, 2020

bkesecker commented May 28, 2020

JasonHoku commented May 28, 2020

bkesecker commented May 28, 2020

JasonHoku commented May 28, 2020

JasonHoku commented May 29, 2020

slassen commented May 29, 2020

JasonHoku commented May 29, 2020

Updates to Install and Rules pages #47

Updates to Install and Rules pages #47

Conversation

JasonHoku commented May 24, 2020

JasonHoku commented May 24, 2020

JasonHoku commented May 24, 2020

JasonHoku commented May 24, 2020

InoUno commented May 24, 2020

JasonHoku commented May 25, 2020

InoUno commented May 25, 2020

InoUno commented May 25, 2020 • edited Loading

InoUno commented May 27, 2020 • edited Loading

slassen commented May 28, 2020

bkesecker commented May 28, 2020

bkesecker May 28, 2020

Choose a reason for hiding this comment

JasonHoku May 28, 2020

Choose a reason for hiding this comment

JasonHoku May 28, 2020

Choose a reason for hiding this comment

bkesecker commented May 28, 2020

JasonHoku commented May 28, 2020

JasonHoku commented May 28, 2020

bkesecker commented May 28, 2020

JasonHoku commented May 28, 2020

bkesecker commented May 28, 2020

JasonHoku commented May 28, 2020

JasonHoku commented May 29, 2020

slassen commented May 29, 2020

JasonHoku commented May 29, 2020

InoUno commented May 25, 2020 •

edited

Loading

InoUno commented May 27, 2020 •

edited

Loading