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.

Sign up for GitHub

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

General Changes #15

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
91d72ab
beautified the index.html
lejshi3 Oct 20, 2020
6dab1e1
Replaced the Placeholders with Placeholders
lejshi3 Nov 18, 2020
0210564
Merge branch 'master' of https://github.com/SirJoshi/Cortex-Command-C…
lejshi3 Nov 18, 2020
ce35043
Update index.html
lejshi3 Nov 18, 2020
e1f907e
Update index.html
lejshi3 Nov 18, 2020
62d6d35
mmmmmm
lejshi3 Nov 18, 2020
e45ae9f
jhmmmm
lejshi3 Nov 18, 2020
c1f7ca0
idk anymore
lejshi3 Nov 18, 2020
cd4f8d8
Update package.json
lejshi3 Nov 18, 2020
deb48e2
Update index.html
lejshi3 Nov 18, 2020
c1982e8
please let this let it build on gh
lejshi3 Nov 18, 2020
b2ef7a9
Update package.json
lejshi3 Nov 18, 2020
d2f734b
Update package.json
lejshi3 Nov 18, 2020
af8e01a
Update package.json
lejshi3 Nov 18, 2020
db6c0f8
Update Home.js
lejshi3 Nov 18, 2020
3c90b99
Update index.html
lejshi3 Nov 18, 2020
403d334
Update package.json
lejshi3 Nov 18, 2020
c21d328
Update Home.js
lejshi3 Nov 18, 2020
3f101e5
indentation
lejshi3 Nov 18, 2020
687cdc5
Lots of Changes
lejshi3 Nov 18, 2020
7a54356
Misc Changes
lejshi3 Dec 20, 2020
dd060e9
get involved page
lejshi3 Dec 20, 2020
c35cb99
made it more cortexy
lejshi3 Jan 2, 2021
762ee5b
Merge https://github.com/cortex-command-community/Cortex-Command-Comm…
lejshi3 Jan 31, 2021
d9a00e7
download page
lejshi3 Feb 6, 2021
a155b07
stuff and things
lejshi3 Feb 6, 2021
ff4450e
changed the images into gifs
lejshi3 Feb 6, 2021
5415f1c
Update package.json
lejshi3 Mar 5, 2021
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
816 changes: 438 additions & 378 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-solid-svg-icons": "^5.15.1",
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<div id="root"></div>
<!--
This HTML file is a template.
Expand Down
7 changes: 5 additions & 2 deletions src/components/Home/CortexCardContents/CortexCardContents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,18 @@ function CortexCardContents(props) {
}}>
<h1>{props.title}</h1>
<p>{props.body}</p>

</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.

border: '2px solid black',
backgroundColor: 'black',
minHeight: '196px',
width: '196px',
}} />
}}
src={props.image} alt={props.alt}
/>
</div>
);
}
Expand Down
13 changes: 12 additions & 1 deletion src/components/Home/Home.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.


import DummySquadImg from './img/Team.png'
import JoystickImg from './img/Joystick.png'
import BuymenuImg from './img/BuyMenu.png'
Copy link
Contributor

Choose a reason for hiding this comment

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

probably BuyMenuImg

These can alternatively be included in /public in which case they won't be base64 encoded. I think I'm doing it both ways currently (probably a bad idea) for the existing images.


function Home() {
return (
<div style={{ backgroundColor: '#111'}}>
Expand All @@ -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

/>
</CortexCard>
<CortexCard right>
<CortexCardContents
right
title='New Content'
body='New weapons, characters, and scenes.'
body='New weapons, characters, and scenes.' image={BuymenuImg}
alt='a buy menu'
/>
</CortexCard>
<CortexCard>
<CortexCardContents
title='Improved Strategic Gameplay'
body='The team has focused on accentuating the most satisfying gameplay elements.'
image={JoystickImg}
alt='a joystick'
/>
</CortexCard>
</CortexCardContainer>
Expand Down
Binary file added src/components/Home/img/BuyMenu.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/components/Home/img/Joystick.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/components/Home/img/Team.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.