Skip to content

Dev #91

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
Earlo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dev #91

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
a837dbf
update package
Earlo Oct 28, 2020
37b85e1
Merge pull request #79 from hackjunction/feature/newfrontpage
Earlo Oct 28, 2020
8af7a4e
remove duplicate logo
Earlo Oct 28, 2020
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
26 changes: 13 additions & 13 deletions frontend/app/package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion frontend/app/src/pages/Connected/Components/HubSelector/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const HubSelector = ({ hubs }) => {
{hub.name}
</div>
<div className="LocalTime">
{moment().utcOffset(hub.timezone).format('h:mm a')}
{moment(moment(), 'h:mm a').utcOffset(hub.timezone)}
</div>
<div className="HubDetails">
<p className="HubDetails--country">{hub.country}</p>
Expand Down
9 changes: 0 additions & 9 deletions frontend/app/src/pages/Connected/Home/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,15 +568,6 @@ const ConnectedHome = (props) => {
/>
</a>
</div>
<div class="logoContainer">
<a href="https://hackyeah.pl/" target="_blank">
<img
className="logoIMG"
src={require('../../../assets/logos/supporting/hackyeah.png')}
alt="connected-logo-here"
/>
</a>
</div>
<div class="logoContainer">
<a href="https://swwekenya.com/" target="_blank">
<img
Expand Down