Skip to content
This repository has been archived by the owner on Jul 30, 2021. It is now read-only.

Commit

Permalink
Merge pull request #44 from RitaOak/interface-fixes
Browse files Browse the repository at this point in the history 
Interface fixes
  • Loading branch information
@brecke
brecke authored May 28, 2020
2 parents 0cd76aa + 54e3394 commit 48b22e4
Show file tree
Hide file tree
Showing 29 changed files with 447 additions and 636 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ dist/
node_modules/
test/integration/screenshots-current/
_site/
.DS_Store
.DS_Store
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ Integration with the backend is still experimental and requires a few changes to

## Help

Find us on [discord](https://discord.gg/RShTcdq).
Find us on [discord](https://discord.gg/CcNnbGk).
1 change: 1 addition & 0 deletions images/illustration.svg
View file
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 images/landing-img.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@

<!-- Open Sans Font-->
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&amp;lang=en" />
<link href="https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@800&display=swap" rel="stylesheet">
<!-- See https://goo.gl/OOhYW5 -->
<link rel="manifest" href="manifest.json">

Expand Down
3 changes: 0 additions & 3 deletions src/actions/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ const loadPage = page => dispatch => {
case 'view2':
import('../components/my-view2.js');
break;
case 'view3':
import('../components/my-view3.js');
break;
case 'oae':
import('../components/oae.js');
break;
Expand Down
79 changes: 0 additions & 79 deletions src/actions/shop.js
View file

This file was deleted.

52 changes: 27 additions & 25 deletions src/components/dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import dashboardStyles from '../../style/dashboard.scss';
import dashboardButtonsStyles from '../../style/dashboard-filter.scss';
import { PageViewElement } from './page-view-element.js';
import '@polymer/iron-icons/iron-icons.js';
import './sidebar.js';
import './top-nav.js';
import './sidebarV2.js';
import './top-navV2.js';
import './info-card.js';
import './tag-card.js';
import './news-feed.js';
Expand All @@ -19,18 +19,21 @@ class OAEDashboard extends PageViewElement {

render() {
return html`
<section class="hero is-link is-fullheight">
<section class="hero is-fullheight">
<!-- Hero head: will stick at the top -->
<div class="hero-head">
<top-nav></top-nav>
</div>
<!-- Hero content: will be in the middle -->
<div class="hero-body">
<div class="container is-fluid is-fullheight is-mobile">
<div class="container content-wrapResponsive is-fluid">
<div class="columns dasboard">
<div class="column is-narrow sidebar">
<div class="column is-narrow sidebar is-fullheight">
<sidebar-nav></sidebar-nav>
</div>
<div class="column content-base">
<div class=" column content-wrap">
<div class="column top-nav">
<top-nav></top-nav>
</div>
<div class=" columns is-flex main-content">
<div class="column is-three-fifths main-left">
<section class="column activity-dashboard">
Expand All @@ -40,31 +43,30 @@ class OAEDashboard extends PageViewElement {
<li>Dashboard</li>
</ul>
</section>
<nav class="level">
<!-- Left side -->
<div class="level-left">
<div class="level-item">
<span class="dashboard-icon">
<iron-icon icon="icons:update"></iron-icon>
</span>
<h3>Recent Activity</h3>
</div>
<nav class="level">
<!-- Left side -->
<div class="level-left">
<div class="level-item">
<span class="dashboard-icon">
<iron-icon icon="icons:update"></iron-icon>
</span>
<h3>Recent Activity</h3>
</div>
<!-- Right side -->
<div class="level-right">
<div class="buttons">
<button class="button filter-feed filter-active-feed">Most Recent</button>
<button class="button filter-feed">Oldest</button>
</div>
</div>
<!-- Right side -->
<div class="level-right">
<div class="buttons">
<button class="button filter-feed filter-active-feed">Most Recent</button>
<button class="button filter-feed">Oldest</button>
</div>
</nav>
</div>
</nav>
<news-feed></news-feed>
<news-feed></news-feed>
<news-feed></news-feed>
</section>
</div>
<div class="column">
<quick-settings></quick-settings>
<info-card></info-card>
</div>
</div>
Expand Down
17 changes: 9 additions & 8 deletions src/components/groups.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import sharedStyles from '../../style/app.scss';
import groupStyles from '../../style/groups.scss';
import groupButtonStyles from '../../style/groups-filter.scss';
import { PageViewElement } from './page-view-element.js';
import './sidebar.js';
import './top-nav.js';
import './sidebarV2.js';
import './top-navV2.js';
import './groups-feed.js';
import './groups-about.js';
import './news-feed.js';
Expand All @@ -19,18 +19,19 @@ class OAEGroups extends PageViewElement {

render() {
return html`
<section class="hero is-link is-fullheight">
<section class="hero is-fullheight">
<div class="hero-head">
<top-nav></top-nav>
</div>
<div class="hero-body">
<div class="container is-fluid is-fullheight is-mobile">
<div class="container content-wrapResponsive is-fluid">
<div class="columns dasboard">
<div class="column is-narrow sidebar">
<sidebar-nav></sidebar-nav>
</div>
<div class="column content-base">
<div class=" column content-wrap">
<div class="column top-nav">
<top-nav></top-nav>
</div>
<div class=" columns is-flex main-content">
<div class="column is-three-fifths">
<section class="is-flex">
Expand Down Expand Up @@ -61,7 +62,7 @@ class OAEGroups extends PageViewElement {
<news-feed></news-feed>
<news-feed></news-feed>
</div>
<div class="column">
<div class="column is-one-fifth">
<groups-about></groups-about>
</div>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/homepage-navV2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ class homeNavV2 extends LitElement {
<nav class="navbar home-nav">
<div class="navbar-brand">
<a class="navbar-item logo" href="http://0.0.0.0:8080/oae">
<img src="/images/logo-oae2.svg" />
<img src="/images/logo-oae9.svg" />
</a>
</div>
<div class="navbar-end navEnd">
<div class="navbar-item">
<div class="buttons">
<a class="button is-round register-button">Register</a>
<a class="button is-round signIn-button">Sign In</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/homepage-searchV2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class homeSearchV2 extends LitElement {
return html`
<div class="field home-search">
<div class="control has-icons-left home-searchIcon">
<input class="input is-rounded" type="search" placeholder="Hint: press ENTER to search" />
<input class="input is-rounded" type="search" placeholder="Search for keywords like 'open apereo' " />
<span class="icon is-left ">
<iron-icon icon="search"></iron-icon>
</span>
Expand Down
18 changes: 10 additions & 8 deletions src/components/library.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import sharedStyles from '../../style/app.scss';
import library from '../../style/library.scss';
import { PageViewElement } from './page-view-element.js';
import '@polymer/iron-icons/iron-icons.js';
import './sidebar.js';
import './top-nav.js';
import './sidebarV2.js';
import './top-navV2.js';
import './info-card.js';
import './tag-card.js';
import './news-feed.js';
Expand All @@ -20,20 +20,22 @@ class OAELibrary extends PageViewElement {

render() {
return html`
<section class="hero is-link is-fullheight">
<section class="hero is-fullheight">
<div class="hero-head">
<top-nav></top-nav>
</div>
<!-- Hero head: will stick at the top -->
<div class="hero-body">
<div class="container is-fluid is-fullheight is-mobile">
<div class="container content-wrapResponsive is-fluid">
<div class="columns dasboard">
<div class="column is-narrow sidebar">
<sidebar-nav></sidebar-nav>
</div>
<div class="column content-base">
<div class=" column content-wrap">
<div class="column top-nav">
<top-nav></top-nav>
</div>
<div class=" columns is-flex main-content">
<div class="column is-four-fifths main-left">
<div class="column is-two-thirds main-left">
<section class="column activity-dashboard">
<section class="is-flex">
<ul class="breadcrumb">
Expand Down
Loading

0 comments on commit 48b22e4

Please sign in to comment.