-
Notifications
You must be signed in to change notification settings - Fork 37
ISSUE-30: Main Layout #31
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
Open
carlan
wants to merge
6
commits into
CodingGarden:master
Choose a base branch
from
carlan:feature/issue-30
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e1bbda9
ISSUE-30: Main Layout
carlan 0b9bb6e
ISSUE-30: Main Layout
carlan eeaadf3
Merge branch 'master' into feature/issue-30
carlan ce0b1c9
ISSUE-30: Main Layout
carlan 1c95a31
Merge branch 'feature/issue-30' of github.com:carlan/entropychat.app …
carlan 8d489b1
ISSUE-30: Main Layout
carlan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| <template> | ||
| <div class="channel-button" :class="selected && 'active'"> | ||
| <div> | ||
| <i data-feather="hash" class="hashtag"></i> | ||
| <span>{{name}}</span> | ||
| </div> | ||
| <div class="actions" v-if="true"> | ||
| <i data-feather="user-plus" class="add"></i> | ||
| <i data-feather="settings" class="settings"></i> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import { onMounted } from '@vue/composition-api'; | ||
|
|
||
| export default { | ||
| props: { | ||
| name: { | ||
| type: String, | ||
| required: true, | ||
| }, | ||
| selected: { | ||
| type: Boolean, | ||
| default: false, | ||
| }, | ||
| }, | ||
| setup() { | ||
| onMounted(() => { | ||
| // eslint-disable-next-line no-undef | ||
| feather.replace(); | ||
| }); | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang="scss"> | ||
| .channel-button { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: space-between; | ||
|
|
||
| padding: 5px 3px; | ||
|
|
||
| border-radius: 5px; | ||
|
|
||
| background-color: transparent; | ||
| transition: background-color 0.3s; | ||
|
|
||
| cursor: pointer; | ||
|
|
||
| .actions { | ||
| visibility: hidden; | ||
| } | ||
|
|
||
| div { | ||
| display: flex; | ||
| align-items: center; | ||
| } | ||
|
|
||
| div span { | ||
| font-size: 13px; | ||
|
|
||
| margin-left: 5px; | ||
|
|
||
| color: $septenary; | ||
| } | ||
|
|
||
| &:hover { | ||
| background-color: $senary; | ||
| // padding: 3px 3px; | ||
|
|
||
| div span { | ||
| font-weight: bold; | ||
| color: $white; | ||
| } | ||
|
|
||
| div.actions { | ||
| visibility: visible; | ||
| } | ||
| } | ||
|
|
||
| .hashtag { | ||
| width: 18px; | ||
| height: 18px; | ||
|
|
||
| color: $symbol; | ||
| } | ||
|
|
||
| .add { | ||
| width: 16px; | ||
| height: 16px; | ||
|
|
||
| color: $symbol; | ||
|
|
||
| cursor: pointer; | ||
|
|
||
| transition: color 0.3s; | ||
|
|
||
| &:hover { | ||
| color: $white; | ||
| } | ||
| } | ||
|
|
||
| .settings { | ||
| width: 16px; | ||
| height: 16px; | ||
|
|
||
| margin-left: 4px; | ||
|
|
||
| color: $symbol; | ||
|
|
||
| cursor: pointer; | ||
|
|
||
| transition: color 0.3s; | ||
|
|
||
| &:hover { | ||
| color: $white; | ||
| } | ||
| } | ||
| } | ||
| </style> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <template> | ||
| <div class="communities"> | ||
| <CommunityButton :isHome="true" /> | ||
|
|
||
| <div class="separator"></div> | ||
|
|
||
| <CommunityButton draggable="true" /> | ||
| <CommunityButton :hasNotifications="true" :mentions="1" draggable="true" /> | ||
| <CommunityButton draggable="true" /> | ||
| <CommunityButton :mentions="1" draggable="true" /> | ||
| <CommunityButton :hasNotifications="true" draggable="true" /> | ||
| <CommunityButton draggable="true" /> | ||
| <CommunityButton draggable="true" /> | ||
| <CommunityButton draggable="true" /> | ||
| <CommunityButton draggable="true" /> | ||
| <CommunityButton draggable="true" /> | ||
| <CommunityButton draggable="true" /> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import CommunityButton from '@/components/community/CommunityButton.vue'; | ||
|
|
||
| export default { | ||
| components: { | ||
| CommunityButton, | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang="scss"> | ||
| @import '@/styles/abstracts/_variables.scss'; | ||
|
|
||
| .communities { | ||
| grid-area: COM; | ||
|
|
||
| max-height: 100vh; | ||
| overflow-y: scroll; | ||
|
|
||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| justify-content: flex-start; | ||
|
|
||
| background-color: $quaternary; | ||
| padding: 11px 0; | ||
|
|
||
| &::-webkit-scrollbar { | ||
| display: none; | ||
| -ms-overflow-style: none; | ||
| scrollbar-width: none; | ||
| } | ||
|
|
||
| .separator { | ||
| width: 32px; | ||
|
|
||
| border-bottom: 2px solid $quinary; | ||
| margin-bottom: 8px; | ||
| } | ||
| } | ||
| </style> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| <template> | ||
| <button :class="[ 'community-button', | ||
| isHome && 'home' || 'notHome', | ||
| hasNotifications && 'notification', | ||
| mentions > 0 && 'mention', ]"> | ||
| <span v-if="isHome"><img src="@/assets/logo-white.png" /></span> | ||
| </button> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| props: { | ||
| selected: { | ||
| type: Boolean, | ||
| default: false, | ||
| }, | ||
| isHome: { | ||
| type: Boolean, | ||
| default: false, | ||
| }, | ||
| hasNotifications: { | ||
| type: Boolean, | ||
| default: false, | ||
| }, | ||
| mentions: Number, | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang="scss"> | ||
| .community-button { | ||
| width: 48px; | ||
| height: 48px; | ||
|
|
||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| flex-shrink: 0; | ||
|
|
||
| margin-bottom: 8px; | ||
|
|
||
| background-color: $secondary; | ||
|
|
||
| cursor: pointer; | ||
|
|
||
| position: relative; | ||
|
|
||
| border-radius: 25px; | ||
|
|
||
| img { | ||
| width: 32px; | ||
| height: 32px; | ||
| } | ||
|
|
||
| transition: border-radius .3s, background-color .3s; | ||
|
|
||
| &.active, &:hover { | ||
| border-radius: 15px; | ||
| } | ||
|
|
||
| &.home { | ||
| background-color: $primary; | ||
|
|
||
| &.active, &:hover { | ||
| background-color: $green; | ||
| } | ||
| } | ||
|
|
||
| &.notHome { | ||
| &.active, &:hover { | ||
| background-color: $discord; | ||
| } | ||
| } | ||
|
|
||
| &.notification { | ||
| &::before { | ||
| content: ''; | ||
|
|
||
| width: 9px; | ||
| height: 9px; | ||
|
|
||
| position: absolute; | ||
| left: -17px; | ||
| top: calc(50% - 4.5px); | ||
|
|
||
| background-color: $white; | ||
| border-radius: 25px; | ||
| } | ||
| } | ||
|
|
||
| &.mention { | ||
| &::after { | ||
| // TODO: Bind to computed property or something | ||
| content: '1'; | ||
|
|
||
| width: auto; | ||
| height: 16px; | ||
|
|
||
| position: absolute; | ||
| bottom: -4px; | ||
| right: -4px; | ||
|
|
||
| background-color: $notification; | ||
| border-radius: 12px; | ||
| padding: 0 4px; | ||
|
|
||
| border: 4px solid $quinary; | ||
|
|
||
| text-align: right; | ||
| font-size: 13px; | ||
| font-weight: bold; | ||
|
|
||
| color: $white; | ||
| } | ||
| } | ||
| } | ||
| </style> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Uh oh!
There was an error while loading. Please reload this page.
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 was wondering about lots of things while doing the layout and kept my fingers out of many things intentionally. Otherwise, CJ won't have anything to show on stream 😉
My intentions with my PR's are create a starting point where CJ can pick where I left off and create content. Well, apart from the Docker one, that's a real fix.
Thanks.
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.
This is fine for now. Eventually we will remove feathers icons and use the icons shidotmoe created.