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

Updates to Install and Rules pages #47

Closed
Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2d9226d
Updates to Install and Rules pages , compiled from edenxi.com and dis…
JasonHoku May 24, 2020
14a9893
main pr: updates to install and rules
JasonHoku May 24, 2020
e815f00
applied npm run format *
JasonHoku May 24, 2020
e6bd8cf
Don't use /public as static path for serving files
InoUno May 24, 2020
9dece20
Revert "applied npm run format *"
JasonHoku May 25, 2020
f54e697
resolved overformatting issue from previous commit
JasonHoku May 25, 2020
42a3add
Temporarily hide the login/register tools.
danny-vvv May 25, 2020
de9b674
fixed install page that was reverted in last commit ^^;
JasonHoku May 27, 2020
3529749
Restore original package files
InoUno May 27, 2020
a7cd5d6
Merge commit 'e6bd8cf2b47959fcaea3444f13524275a577fd77' into disable-…
danny-vvv May 27, 2020
d215936
Add features config with account features disabled, and use config to…
danny-vvv May 27, 2020
a44293a
Use features config to dynamically show/hide login and registration c…
danny-vvv May 27, 2020
5c0dccf
Merge remote-tracking branch 'origin/fix/prod-path' into PR-Install-&…
JasonHoku May 28, 2020
e209c3c
Merge branch 'develop' into PR-Install-&-Rules-info-updates
JasonHoku May 28, 2020
30fd728
Revert "fixed install page that was reverted in last commit ^^;"
JasonHoku May 28, 2020
caa550d
[x]I like the last updated timestamp on terms and conditions. Maybe w…
JasonHoku May 28, 2020
5fe4333
ran prettier :P
JasonHoku May 28, 2020
370a6cc
Merge remote-tracking branch 'origin/disable-login' into PR-Install-&…
JasonHoku May 28, 2020
e8efe24
fix for install/rules pr
JasonHoku May 29, 2020
0ef8104
Restored quote formatting error caused by overzealous vscode plugin.
JasonHoku May 29, 2020
10618bc
Fixed formatting errors caused by overzealous vsc addon.
JasonHoku May 29, 2020
a5e6265
Merge remote-tracking branch 'origin/Branch_30fd728e' into PR-Install…
JasonHoku May 29, 2020
3827d23
Merge branch 'develop' into PR-Install-&-Rules-info-updates
JasonHoku May 29, 2020
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
5 changes: 3 additions & 2 deletions api/v1/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ module.exports = {
'Testing known or possible exploits on the live server is not allowed unless permission is given from Godmode first. Like every other rule this includes GMs and developers too.',
"Holding a monster for the purpose of grieving other players or monopolizing the time it spawns is NOT allowed (note that since determining a player's intent is highly subjective to the GM addressing the ticket, if asked to begin damage by a GM you must start fighting the monster within a reasonable amount of time or you will forfeit the claim)",
"Reasonable is up to the GM team's discretion.",
'Holding to recover from a wipe is allowed.',
"Intention to kill with reinforcements on the way isn't holding.",
' ^Holding to recover from a wipe is allowed.',
"Darters in Dragon's Aery may be held alive 5 minutes from time of claim. Period. Please see #announcements or ask a GM for more information if you need it.",
" ^Intention to kill with reinforcements on the way isn't holding.",
"Not so much a rule either but if you are aware of any non-era item/NM/recipe/et cetera please report it. And do expect the rewards obtained from it to be removed. I can't find every non-era thing at once but as I find them I will be removing them.",
'Creating characters for the purpose of market manipulation is NOT allowed.',
'Gardening is only allowed on up to 3 characters. (30 total plants.)',
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/install.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function install(props) {
const { info } = props;

return (
<Container>
<>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

<Row className="mb-3">
<Col>
<InfoDisplay title="Account Registration">
Expand Down Expand Up @@ -109,7 +109,7 @@ function install(props) {
</InfoDisplay>
</Col>
</Row>
</Container>
</>
);
}

Expand Down
Loading