Skip to content

General Changes #15

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

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Conversation

lejshi3
Copy link
Contributor

@lejshi3 lejshi3 commented Nov 18, 2020

I replaced the black squares on the home page with semi-related placeholders using images from the CC tutorial screens. These changes are placeholders and not meant to be final, they're just supposed to make putting in new images in their place easier in the future, also they look nicer than black squares.

image

Note: If this Pull Request is Accepted, Please Change the "Homepage": "https://sirjoshi.github.io/Cortex-Command-Community.github.io/", with "Homepage": "Cortex-Command-Community.github.io" or delete the line altogether or else it will show a blank webpage when deployed.

facebook robot code bad,
indented human code good.
I replaced the black squares with pictures from the game's tutorial files.

I would not call these changes final, but it will save some time for when someone has new pictures/gifs to go here.

the quest for the pink role continues
i am in pain, i am going to make a pull request soon
maybe this will work?
Copy link
Contributor

@garethyr garethyr left a comment

Choose a reason for hiding this comment

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

I'll leave code structure comments to Tom, here's some cleanup for you to do while you wait for his review.

package.json Outdated
@@ -2,6 +2,7 @@
"name": "cortex",
"version": "0.1.0",
"private": true,
"homepage": "https://sirjoshi.github.io/Cortex-Command-Community.github.io/",
Copy link
Contributor

Choose a reason for hiding this comment

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

It's not a big deal, but you should do a little cleanup - in your dev environment, change this yourself and commit it to your relevant branch so it doesn't show up as cruft here.

@@ -28,7 +28,7 @@
<title>Cortex Command Community Project</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<noscript>You need to enable JavaScript to view this page, nerd.</noscript>
Copy link
Contributor

Choose a reason for hiding this comment

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

Undo this please and thanks.

@@ -7,6 +7,12 @@ import CortexCardContainer from './CortexCardContainer/CortexCardContainer';
import CortexCardContents from './CortexCardContents/CortexCardContents';
import MagicArrow from './MagicArrow/MagicArrow';

/*i pray to god (if there is one) that there is a beter way to go about this than just manually importing every images*/
Copy link
Contributor

Choose a reason for hiding this comment

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

Kill off this comment please.
For your future knowledge, a good way to do this sort of thing is leave your own comment on the PR, explaining that you're unsure of whether this is the right way to do something. It means cleaner code and it's pretty much impossible for reviewers to miss.

@@ -27,19 +33,24 @@ function Home() {
<CortexCardContents
title='Upgraded Engine'
body='The source code has been enhanced to improve performance.'
image={DummySquadImg}
alt='some dummies'
Copy link
Contributor

Choose a reason for hiding this comment

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

Please change the alt text slightly so it's a little better/more uniform:
some dummies -> Dummy Squad Image
a buy menu -> Buy Menu Image
a joystick -> Joystick Image

made much more descriptive alt texts
professionalism
deleted the homepage property
@lejshi3
Copy link
Contributor Author

lejshi3 commented Nov 18, 2020

Some changes have been made in the name of Accessibility and Professionalism

not important, just was bugging me
1. Modified the Page to be Dark not Light (Light is gross)

2. Made the 404 Page Cooler

3. Made the Downloads have a direct link to Pre2 and a Get Mods section that links to the Discord and the Mod.io

4. Modified the Downloads page to make the border go even further arround the text (it just looks cooler)
Copy link
Contributor Author

@lejshi3 lejshi3 left a comment

Choose a reason for hiding this comment

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

Changes:

  1. I changed a lot of CSS and Style to make the Pages Dark as Opposed to Light

  2. I added placeholder images to the home page to make adding in new pics/gifs easier

  3. I no longer call js-phobics nerds

  4. I made some subtle changes to the style of the Downloads page

  5. I added a direct link to Pre 2 in the Downloads page

  6. I added a Get Mods section to the Downloads page that links to the Discord and the Mod.io

Copy link
Contributor

@tomflenniken tomflenniken left a comment

Choose a reason for hiding this comment

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

Looking good, I definitely like the new placeholder images. I agree gifs would be nice, but this is a great start.

</div>
</div>
{/* This is an image placeholder **Imagine an Image** */}
<div style={{
<img style={{
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe the original indentation was correct here.

/>
</CortexCard>
<CortexCard>
<CortexCardContents
title='Improved Strategic Gameplay'
body='The team has focused on accentuating the most satisfying gameplay elements.'
image={JoystickImg}
alt='A Handdrawn/Pixelart Image of a Joystick, an input method that can be used to (ineffiecently) play Cortex Command.'
Copy link
Contributor

Choose a reason for hiding this comment

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

probably too long for alt text - though I appreciate the levity.
Maybe cut it to A pixel art image of a joystick.

Also I think sentence case is appropriate for these alt texts.
I would also avoid using "/" because a primary use for alt text is screen readers, and I don't think they'd read that out in a natural sounding way.

Thanks for providing alt text, it's probably not super critical for a site for a game that has 0 accessibility features, but it helps for making the web a bit more inclusive.

<h1 style={{ marginTop: '48px' }}>Page Not Found</h1>
<p>Sorry, but the page you were trying to view does not exist.</p>
<br />
<br />
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not wholly opposed to using <br /> here (I might have used it some places myself), but generally I think using CSS for spacing should be preferred.

Don't change it if you don't feel like it.

<h1 style={{ marginTop: '48px' }}>Page Not Found</h1>
<p>Sorry, but the page you were trying to view does not exist.</p>
<br />
<br />
<a href='https://www.youtube.com/watch?v=t0s9dRNjhfg?autoplay=1'><img style={{postion: 'absolute', width: '25%'}} src={EmojiDunno}/></a>
Copy link
Contributor

Choose a reason for hiding this comment

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

Interesting easter egg. Doesn't seem super relevant in this context, but I'm fine with it.

@@ -1,6 +1,6 @@
body {
color: #111;
background-color: #eee
color: #EEE;
Copy link
Contributor

Choose a reason for hiding this comment

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

I like the light theme :(

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually, can you pull out the theme edits into a separate branch? I think it needs to be addressed separately. I think it's a good opportunity to adjust the stylesheets and how style is managed across the site.
See #9

function NotFound() {
return (
<Template>
<div style={{textAlign: 'center'}}>
Copy link
Contributor

Choose a reason for hiding this comment

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

I think left aligned is more professional looking, at least for text.

@@ -12,8 +12,10 @@ function Template(props) {
<Header />
<div style={{
margin: 'auto',
marginBottom: '0px',
Copy link
Contributor

Choose a reason for hiding this comment

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

What are the changes in this file for?

@@ -7,6 +7,11 @@ import CortexCardContainer from './CortexCardContainer/CortexCardContainer';
import CortexCardContents from './CortexCardContents/CortexCardContents';
import MagicArrow from './MagicArrow/MagicArrow';

/*image imports*/
Copy link
Contributor

Choose a reason for hiding this comment

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

I think prettier or something enforces import ordering, so I typically just put all the imports together so the autoformatter can do its thing.

<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases/download/v0.1.0-pre2/CCCP.v0.1.0-pre2.zip'>Pre 2 <img width='14px' height='14px' marginBottom='-12px' src={EmojiGood}/> (latest)</Button>

</Card>
<h2>Mods</h2>
Copy link
Contributor

Choose a reason for hiding this comment

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

With the addition of some more content on this page I think it's looking a little cluttered. No action required now, but I will probably be restructuring some of the headings on this page/grouping up some of the card content.

<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases'>Releases</Button>

<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases/download/v0.1.0-pre2/CCCP.v0.1.0-pre2.zip'>Pre 2 <img width='14px' height='14px' marginBottom='-12px' src={EmojiGood}/> (latest)</Button>
Copy link
Contributor

Choose a reason for hiding this comment

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

marginBottom here is giving a console error. It should be defined as part of a style attribute
style={{ marginBottom= ... }}

@tomflenniken
Copy link
Contributor

responsive buttons
I noticed a responsiveness issue for the buttons that should be addressed.

@lejshi3 lejshi3 changed the title Placeholderier Placeholders General Changes Feb 6, 2021
@lejshi3
Copy link
Contributor Author

lejshi3 commented Feb 6, 2021

Okay, Hello, Happy 2021.

A lot of the issues above have been addressed so i'll keep this brief.

  • Added GIFS
  • Added Get Involved
  • Expanded on the Downloads Page

After the PR, I'd consider the website in a usable state.

@lejshi3 lejshi3 requested a review from garethyr February 6, 2021 19:29
@tomflenniken
Copy link
Contributor

@sirjoshi can you split the changes out into separate branches for the different pages that they impact (or any other reasonable way to break down the changes here)?

I think we should tackle these in a more targeted manner, I think it will be easier to get your changes through in chunks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants