Skip to content
This repository has been archived by the owner on May 6, 2023. It is now read-only.

Commit

Permalink
make add account button clickable start foundation for profile settings
Browse files Browse the repository at this point in the history
  • Loading branch information
mworzala committed Aug 30, 2019
1 parent 66c8293 commit 162d2fe
Show file tree
Hide file tree
Showing 20 changed files with 126 additions and 15 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "proton",
"version": "0.3.4",
"version": "0.3.5",
"description": "A custom minecraft launcher",
"private": false,
"author": "Matt Worzala <bhop.me>",
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import './render2/common/standard.css';
import './render2/common/window_control.css';
import './render2/common/contextmenu.css';

// import './render/core/index.css';
// import App from './render/core/App';
import './render/core/index.css';
import App from './render/core/App';

const doc = document.createElement("style");
doc.innerHTML = window.ipc.sendSync('theme');
Expand Down
2 changes: 1 addition & 1 deletion src/render/account/AccountManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class AccountManager extends React.Component {
return (<Account key={acc._id} {...acc} />);
})}
</div>
<button onClick={() => window.ipc.send('account:inst')}>Add Account</button>
<button id="temp" onClick={() => window.ipc.send('account:inst')}>Add Account</button>
{/*</div>*/}
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/render/account/accounts.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/render/account/accounts.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/render/account/accounts.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

}



.am-content {
box-sizing: border-box;

Expand Down Expand Up @@ -103,7 +105,7 @@

button {
position: absolute;
top: 0;
top: 30px;
right: 0;
outline: none;
user-select: none;
Expand Down
2 changes: 1 addition & 1 deletion src/render/modal/modals/Error.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ let report = {

window.ipc.on('reporter:report', (_, newReport) => {
report = newReport;
ModalConductor.openModal('errorReportModal');
// ModalConductor.openModal('errorReportModal');
});

class ErrorReport extends React.Component {
Expand Down
2 changes: 2 additions & 0 deletions src/render2/accounts/accounts.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/render2/accounts/accounts.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/render2/accounts/accounts.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
position: absolute;
top: 0;
left: 0;
z-index: 1000;
-webkit-app-region: no-drag;
}

.account {
Expand Down
2 changes: 2 additions & 0 deletions src/render2/common/standard.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/render2/common/standard.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/render2/common/standard.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

#root {
display: flex;
width: 100vw;
height: 100vh;
//background-color: var(--background-darker);
background-color: #1b1c1c;
}
Expand Down
1 change: 1 addition & 0 deletions src/render2/custom/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ export default class CustomProfile extends React.Component {
version,
name: this.state.input_name.trim(),
});
this.props.history.push('/profiles');
}

render() {
Expand Down
7 changes: 4 additions & 3 deletions src/render2/profiles/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import React from 'react';
import { Link } from 'react-router-dom';
import { ContextMenu, ContextMenuTrigger, MenuItem } from 'react-contextmenu';
import { flavorIcon } from "../common/helper";
import { LoadingOverlay } from "../common/overlay";

import './profiles.css';
import {LoadingOverlay} from "../common/overlay";
import './profile_settings.css';

class Profiles extends React.Component {
constructor(props) {
Expand Down Expand Up @@ -69,7 +70,7 @@ const Profile = props => (
<ContextMenu id={props.name}>
<MenuItem onClick={() => window.ipc.send('profile:launch', props.name)}><i className="fas fa-play"/>Launch</MenuItem>
<MenuItem onClick={() => alert("// not implemented //")} disabled><i className={`fa${props.favorite ? 'r' : 's'} fa-star`}/>Favorite</MenuItem>
<MenuItem onClick={() => props.redirect('/curse')}><i className="fas fa-cog"/>Settings</MenuItem>
<MenuItem onClick={() => props.redirect(`/profiles/${props.id}/settings`)}><i className="fas fa-cog"/>Settings</MenuItem>
<MenuItem onClick={() => window.ipc.send('open:folder', props.directory)}><i className="fas fa-folder"/>Open Folder</MenuItem>
<MenuItem onClick={() => alert("// not implemented //")} disabled><i className="fas fa-link"/>Create Shortcut</MenuItem>
<MenuItem onClick={() => alert("// not implemented //")} disabled><i className="fas fa-file-export"/>Export</MenuItem>
Expand All @@ -83,7 +84,7 @@ class ProfileSettings extends React.Component {

render() {
return (
<div>
<div className="profile-settings">
PROFILE_SETTINGS!!!
</div>
);
Expand Down
43 changes: 43 additions & 0 deletions src/render2/profiles/profile_settings.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/render2/profiles/profile_settings.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 56 additions & 0 deletions src/render2/profiles/profile_settings.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
.profile-settings {
position: absolute;
display: flex;

width: 800px;
height: 500px;

.po-overview-image {
position: relative;

width: 159px;
height: 159px;

margin-left: 3px;

border: none;
border-radius: 3px;

&:hover .po-o-hidden {
display: flex;

& ~ img {
filter: brightness(0.7) blur(1px);
}
}

.po-o-hidden {
position: absolute;
left: 0;
top: 0;
display: none;
justify-content: center;
align-items: center;
cursor: pointer;

width: 100%;
height: 100%;

font-size: 17px;
font-family: Source Sans Pro, sans-serif;
font-style: italic;
color: var(--light);
text-shadow: 2px 2px var(--shadow);

z-index: 10;
}

img {
overflow: hidden;

width: 100%;
height: 100%;
}
}

}
2 changes: 1 addition & 1 deletion src/render2/sidebar/sidebar.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/render2/sidebar/sidebar.less
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
}

nav .sidebar-group {

p {
margin-top: 30px;
padding-left: 10px;
Expand Down

0 comments on commit 162d2fe

Please sign in to comment.