-
Notifications
You must be signed in to change notification settings - Fork 4
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
base: master
Are you sure you want to change the base?
General Changes #15
Changes from all commits
91d72ab
6dab1e1
0210564
ce35043
e1f907e
62d6d35
e45ae9f
c1f7ca0
cd4f8d8
deb48e2
c1982e8
b2ef7a9
d2f734b
af8e01a
db6c0f8
3c90b99
403d334
c21d328
3f101e5
687cdc5
7a54356
dd060e9
c35cb99
762ee5b
d9a00e7
a155b07
ff4450e
5415f1c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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={{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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> | ||
); | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,11 @@ import CortexCardContainer from './CortexCardContainer/CortexCardContainer'; | |
import CortexCardContents from './CortexCardContents/CortexCardContents'; | ||
import MagicArrow from './MagicArrow/MagicArrow'; | ||
|
||
/*image imports*/ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. |
||
import NewImg from './img/stuff.GIF' | ||
import SniperImg from './img/sniper.GIF' | ||
import IntenseImg from './img/crabs.GIF' | ||
|
||
function Home() { | ||
return ( | ||
<div style={{ backgroundColor: '#111'}}> | ||
|
@@ -27,19 +32,25 @@ function Home() { | |
<CortexCardContents | ||
title='Upgraded Engine' | ||
body='The source code has been enhanced to improve performance.' | ||
image={NewImg} | ||
alt='' | ||
/> | ||
</CortexCard> | ||
<CortexCard right> | ||
<CortexCardContents | ||
right | ||
title='New Content' | ||
body='New weapons, characters, and scenes.' | ||
image={IntenseImg} | ||
alt='' | ||
/> | ||
</CortexCard> | ||
<CortexCard> | ||
<CortexCardContents | ||
title='Improved Strategic Gameplay' | ||
body='The team has focused on accentuating the most satisfying gameplay elements.' | ||
image={SniperImg} | ||
alt='' | ||
/> | ||
</CortexCard> | ||
</CortexCardContainer> | ||
|
@@ -50,4 +61,4 @@ function Home() { | |
) | ||
} | ||
|
||
export default Home; | ||
export default Home; |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,29 +3,48 @@ import Template from '../../Template/Template'; | |
import Card from '../../Card/Card'; | ||
import Button from '../../Button/Button'; | ||
|
||
import EmojiGood from '../../Emoji/good.png'; | ||
|
||
function Downloads() { | ||
return ( | ||
<Template> | ||
<h1 style={{ marginTop: '48px' }}>Downloads</h1> | ||
<h2>Project Releases</h2> | ||
<Card title={'Cortex Command Community Project'}> | ||
<p style={{ | ||
marginBottom: '18px', | ||
}}>This is where you can find the community's plans for Cortex Command's future. There'll be rebalancing, new weapons and units, and much more.</p> | ||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases'>Releases</Button> | ||
marginTop: '8px', marginBottom: '18px', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't know if there's any current consistency across the site on a 6px vs 8px based unit size, but it's probably worth being consistent at least internally. Eventually we'd want to move to being able to do something like,
or whatever. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So the takeaway here is to choose which looks better: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Definitely agree that setting up standardized sizes is the way to go. Probably too late to be convenient now, but using rem sizes as opposed to px sizes is quite nice. |
||
}}>This is where you can find the community's plans for Cortex Command's future. There'll be rebalancing, new weapons, units, and much <i>much</i> more.</p> | ||
|
||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/'>View on Github</Button> | ||
|
||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Project-Data/releases/download/v0.1.0-pre3.0/Cortex.Command.zip'>Download Pre 3 (.exe)(latest)</Button> | ||
|
||
</Card> | ||
<h2>Mods</h2> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. |
||
<Card title={'Get Mods'}> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Definitely an important addition. |
||
<p style={{ | ||
marginTop: '8px', marginBottom: '18px', | ||
}}>What is Cortex Command without <strong>MODS</strong>? Luckily, we've got you covered. There are 2 great ways to get mods and if neither of them suit your fancy, you can use the Legacy Mod Converter to convert mods from the Data Realms Fan Forums or the Steam Workshop!</p> | ||
|
||
<Button link to='https://discord.gg/yuZvazK'>Community Discord <img width='14px' height='14px' marginBottom='-12px' src={EmojiGood}/></Button> | ||
|
||
<Button link to='https://cccp.mod.io/'>Mod.io</Button> | ||
|
||
</Card> | ||
<h2>Modding Tools</h2> | ||
<Card title={'Legacy Mod Converter'}> | ||
<p style={{ | ||
marginBottom: '18px', | ||
marginTop: '8px', marginBottom: '18px', | ||
}}>This project automates most of the conversion work required to convert the legacy Cortex Command mods into Cortex Command Community Project compatible mods.</p> | ||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Legacy-Mod-Converter'>Get source</Button> | ||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Legacy-Mod-Converter'>View on Github</Button> | ||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Legacy-Mod-Converter/releases/download/pre3.0.2/_Mod.Converter.zip'>Download Source (.py)(latest)</Button> | ||
</Card> | ||
<Card title={'Bender'}> | ||
<Card title={'CCCP Bender'}> | ||
<p style={{ | ||
marginBottom: '18px', | ||
marginTop: '8px', marginBottom: '18px', | ||
}}>The purpose of this tool is to make the life of modders easier by automagically generating bent limb sprites from limb parts.</p> | ||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Bender/releases'>Releases</Button> | ||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Bender'>View on Github</Button> | ||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Bender/releases/download/1.3.0/CCCP.Bender.1.3.0.zip'>Download Bender 1.3.0 (.exe)(latest)</Button> | ||
</Card> | ||
<div style={{ height: '24px' }} /> | ||
</Template > | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
import React from 'react'; | ||
import Template from '../../Template/Template'; | ||
import Card from '../../Card/Card'; | ||
import Button from '../../Button/Button'; | ||
|
||
import EmojiGood from '../../Emoji/good.png'; | ||
|
||
function Get_Involved() { | ||
return ( | ||
<Template> | ||
<h1 style={{ marginTop: '48px' }}>Get Involved</h1> | ||
<h2>Want to help the Community Project? Here are some links to help you get started.</h2> | ||
|
||
<Card title={'Join the Discord'}> | ||
<p style={{ | ||
marginTop: '8px', marginBottom: '18px', | ||
}}>So you want to take part in the project? A good start would be going to the discord where the project is discussed. You can find a link here. After that, all our releases will be available under the releases area and all of our bugs and changes and ideas are tracked in github issues. Feel free to play and suggest changes or point out any problems.</p> | ||
|
||
<Button link to='https://discord.gg/yuZvazK'>Discord <img width='14px' height='14px' marginBottom='-12px' src={EmojiGood}/></Button> | ||
|
||
</Card> | ||
|
||
<Card title={'Contribute to the Github'}> | ||
<p style={{ | ||
marginTop: '8px', marginBottom: '18px', | ||
}}>If you've got experience with the game's ini data through modding it, are good at spriting or know Lua, maybe you can contribute some of your time directly to the project. We'll look at any pull requests that come in and are always happy to have more hands on deck. If you're an experienced programmer (particularly with C++), there's also tons of work to be done in our source repository.</p> | ||
<p style={{ | ||
marginTop: '8px', marginBottom: '18px', | ||
}}>If you're familiar with github you should be familiar with making issues. It's as simple as going to the issues tab and clicking a button. Once you do that, you'll see an easy to follow template to fill in. After you've done that, try to put in the appropriate category for the issue and it'll be handled from there.</p> | ||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/'>Get Started</Button> | ||
|
||
<Button link to='https://github.com/cortex-command-community/Cortex-Command-Community-Project-Source/issues'>View or Submit an Issue</Button> | ||
|
||
</Card> | ||
|
||
</Template> | ||
); | ||
} | ||
|
||
export default Get_Involved; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,20 @@ | ||
import React from 'react'; | ||
import Template from '../../Template/Template'; | ||
|
||
import EmojiDunno from '../../Emoji/dunno.png'; | ||
|
||
function NotFound() { | ||
return ( | ||
<Template> | ||
<div style={{textAlign: 'center'}}> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think left aligned is more professional looking, at least for text. |
||
<h1 style={{ marginTop: '48px' }}>Page Not Found</h1> | ||
<p>Sorry, but the page you were trying to view does not exist.</p> | ||
<br /> | ||
<br /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not wholly opposed to using Don't change it if you don't feel like it. |
||
<a href='https://www.youtube.com/watch?v=t0s9dRNjhfg?autoplay=1'><img style={{postion: 'absolute', width: '25%'}} src={EmojiDunno}/></a> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. |
||
</div> | ||
</Template> | ||
|
||
); | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,8 +12,10 @@ function Template(props) { | |
<Header /> | ||
<div style={{ | ||
margin: 'auto', | ||
marginBottom: '0px', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What are the changes in this file for? |
||
maxWidth: '800px', | ||
width: '100%', | ||
height: '100%', | ||
flex: '1', | ||
}}> | ||
<div style={{ padding: '0 8px', }}> | ||
|
There was a problem hiding this comment.
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 :(
There was a problem hiding this comment.
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