Skip to content

Redesign the client #137

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

Draft
mfcochauxlaberge wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Redesign the client #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5f0717
Redesign the client
mfcochauxlaberge Jan 10, 2024
3ead7b1
wip
mfcochauxlaberge Apr 10, 2024
bdecbfc
Merge branch 'master' into ark-51-redesign-the-client
mfcochauxlaberge Apr 19, 2024
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
2 changes: 1 addition & 1 deletion src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ type props = {};

const StyledApp = styled.div`
display: grid;
grid-template-rows: 50px 1fr;
grid-template-rows: 60px 1fr;
gap: 10px;
height: 100%;
max-width: 1200px;
Expand Down
10 changes: 7 additions & 3 deletions src/components/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,16 @@ const HeaderStyle = styled.div`
grid-template-columns: 1fr 1fr;
grid-row: 1;
grid-column: 1;
height: 50px;
border-radius: 0 0 4px 4px;
background: #423d39;
height: 100%;
// border-radius: 0 0 4px 4px;
// background: #444;
// border: 2px solid #444;
border-bottom: 4px solid #444;
border-top: 0;
padding: 0 10px;
color: #fff;
z-index: 110;
border: 1px solid red;

div {
display: grid;
Expand Down
2 changes: 1 addition & 1 deletion src/components/MainContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const StyledMainContent = styled.div`
min-height: 0;
height: 100%;
width: 100%;
background: #fff;
// background: #fff;
border-radius: 4px;

@media all and (max-width: 699px) {
Expand Down
3 changes: 2 additions & 1 deletion src/components/MenuPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ const StyledMenuPane = styled.div`
min-height: 0;
height: 100%;
width: 200px;
background: #ede7d4;
// background: #ede7d4;
border: 1px solid pink;

footer {
display: grid;
Expand Down
157 changes: 94 additions & 63 deletions src/components/NotificationPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,68 +83,82 @@ const NotificationPane: FunctionComponent<props> = ({
return (
<StyledNotificationPane style={styleVars}>
<StyledContent>
<ResourcesPane />
<div className="notification-pane-content">
{!loggedIn && <p>You are not logged in.</p>}
</div>
</StyledContent>

<StyledContent>
<MoneyPane />
<div className="notification-pane-content">
<ResourcesPane />
</div>
</StyledContent>
<Scrollable style={{ borderRadius: '4px' }}>
<StyledContent>
{!loggedIn && <p>You are not logged in.</p>}
{loggedIn && error && <p>Construction sites could not be loaded.</p>}
{loggedIn && !hasSites && <p>Nothing is currently being built.</p>}
{loggedIn &&
hasSites &&
sites.map((site) => {
return (
<StyledNotification key={site.id}>
<div>
<MapTile
tile={
new Tile({
position: site.tilePosition,
infrastructure: site.infrastructure,
})
}
size={50}
/>
</div>
<div>
<p>
<b>
Construction on{' '}
<NavLink
end
to={'/island/tiles/' + site.tilePosition}
onClick={onCloseClick}
>
{site.infrastructure.toLocaleLowerCase()} (
{site.tilePosition})
</NavLink>{' '}
</b>
</p>
<p>
Level {site.tile.level} → {site.tile.level + 1}
</p>
</div>
<div>
<p>
Done{' '}
<TimeLeft
target={site.finishedAt}
onReach={() => {
client.cache.evict({
id: 'ConstructionSite:' + site.id,
});
}}
/>
</p>
</div>
</StyledNotification>
);
})}
</StyledContent>
</Scrollable>

<StyledContent>
<div className="notification-pane-content">
<MoneyPane />
</div>
</StyledContent>

{loggedIn && (
<Scrollable style={{ borderRadius: '4px' }}>
<StyledContent>
<div className="notification-pane-content">
{error && <p>Construction sites could not be loaded.</p>}
{!hasSites && <p>Nothing is currently being built.</p>}
{hasSites &&
sites.map((site) => {
return (
<StyledNotification key={site.id}>
<div>
<MapTile
tile={
new Tile({
position: site.tilePosition,
infrastructure: site.infrastructure,
})
}
size={50}
/>
</div>
<div>
<p>
<b>
Construction on{' '}
<NavLink
end
to={'/island/tiles/' + site.tilePosition}
onClick={onCloseClick}
>
{site.infrastructure.toLocaleLowerCase()} (
{site.tilePosition})
</NavLink>{' '}
</b>
</p>
<p>
Level {site.tile.level} → {site.tile.level + 1}
</p>
</div>
<div>
<p>
Done{' '}
<TimeLeft
target={site.finishedAt}
onReach={() => {
client.cache.evict({
id: 'ConstructionSite:' + site.id,
});
}}
/>
</p>
</div>
</StyledNotification>
);
})}
</div>
</StyledContent>
</Scrollable>
)}
</StyledNotificationPane>
);
};
Expand All @@ -156,7 +170,7 @@ type props = {

const StyledNotificationPane = styled.div`
display: grid;
grid-template-rows: auto auto 1fr;
grid-template-rows: auto auto auto 1fr;
gap: 10px;
grid-row: 1;
grid-column: 2;
Expand All @@ -165,6 +179,7 @@ const StyledNotificationPane = styled.div`
height: 100%;
width: 300px;
z-index: 110;
border: 1px solid blue;

@media all and (max-width: 699px) {
display: var(--display);
Expand Down Expand Up @@ -222,9 +237,25 @@ const StyledNotification = styled.div`
const StyledContent = styled.div`
display: grid;
grid-gap: 10px;
padding: 10px;
background: #fff;
border-radius: 4px;
// padding: 10px;
// background: #fff;
// border-radius: 4px;
border: 1px solid green;

.notification-pane-title {
background: #666;
padding: 8px 10px;
color: #fff;
border-radius: 4px 4px 0 0;

@media all and (min-width: 700px) and (max-width: 999px) {
border-radius: 0;
}
}

.notification-pane-content {
padding: 10px;
}
`;

export default NotificationPane;
3 changes: 2 additions & 1 deletion src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ body {
}

body {
background: #ede7d4;
/* background: #ede7d4; */
background: #f8f8f8;
background-size: 800px 400px;
}

Expand Down