random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
mgabdev
2020-03-04 18:08:08 -05:00
parent d31d5fcd81
commit c7da9da84e
23 changed files with 97 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/gabsocial/features/domain_blocks/index.js
View File

@@ -1 +0,0 @@
export { default } from '../domain_blocks'

8
app/javascript/gabsocial/features/favorited_statuses/favorited_statuses.js → app/javascript/gabsocial/features/favorited_statuses.js
View File

@@ -2,10 +2,10 @@ import ImmutablePropTypes from 'react-immutable-proptypes'
import { FormattedMessage } from 'react-intl'
import ImmutablePureComponent from 'react-immutable-pure-component'
import { debounce } from 'lodash'
import { fetchFavoritedStatuses, expandFavoritedStatuses } from '../../actions/favorites'
import { meUsername } from '../../initial_state'
import StatusList from '../../components/status_list'
import ColumnIndicator from '../../components/column_indicator'
import { fetchFavoritedStatuses, expandFavoritedStatuses } from '../actions/favorites'
import { meUsername } from '../initial_state'
import StatusList from '../components/status_list'
import ColumnIndicator from '../components/column_indicator'
const mapStateToProps = (state, { params: { username } }) => {
return {

1
app/javascript/gabsocial/features/favorited_statuses/index.js
View File

@@ -1 +0,0 @@
export { default } from './favorited_statuses'

12
app/javascript/gabsocial/features/favorites/favorites.js → app/javascript/gabsocial/features/favorites.js
View File

@@ -1,12 +1,12 @@
import ImmutablePureComponent from 'react-immutable-pure-component';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { FormattedMessage } from 'react-intl';
import { fetchReposts } from '../../actions/interactions';
import { fetchStatus } from '../../actions/statuses';
import { makeGetStatus } from '../../selectors';
import AccountContainer from '../../containers/account_container';
import ColumnIndicator from '../../components/column_indicator';
import ScrollableList from '../../components/scrollable_list';
import { fetchReposts } from '../actions/interactions';
import { fetchStatus } from '../actions/statuses';
import { makeGetStatus } from '../selectors';
import AccountContainer from '../containers/account_container';
import ColumnIndicator from '../components/column_indicator';
import ScrollableList from '../components/scrollable_list';
const mapStateToProps = (state, props) => {
const getStatus = makeGetStatus();

1
app/javascript/gabsocial/features/favorites/index.js
View File

@@ -1 +0,0 @@
export { default } from './favorites'

1
app/javascript/gabsocial/features/following/index.js
View File

@@ -1 +0,0 @@
export { default } from '../following'

1
app/javascript/gabsocial/features/generic_not_found/index.js
View File

@@ -1 +0,0 @@
export { default } from '../generic_not_found'

0
app/javascript/gabsocial/features/group_create/group_create.js → app/javascript/gabsocial/features/group_create.js
View File

1
app/javascript/gabsocial/features/group_create/index.js
View File

@@ -1 +0,0 @@
export { default } from './group_create'

6
app/javascript/gabsocial/features/group_members/group_members.js → app/javascript/gabsocial/features/group_members.js
View File

@@ -6,10 +6,10 @@ import {
expandMembers,
updateRole,
createRemovedAccount,
} from '../../actions/groups';
} from '../actions/groups';
import { FormattedMessage } from 'react-intl';
import AccountContainer from '../../containers/account_container';
import ScrollableList from '../../components/scrollable_list';
import AccountContainer from '../containers/account_container';
import ScrollableList from '../components/scrollable_list';
const mapStateToProps = (state, { params: { id } }) => ({
group: state.getIn(['groups', id]),

1
app/javascript/gabsocial/features/group_members/index.js
View File

@@ -1 +0,0 @@
export { default } from './group_members'

8
app/javascript/gabsocial/features/group_removed_accounts/group_removed_accounts.js → app/javascript/gabsocial/features/group_removed_accounts.js
View File

@@ -1,15 +1,15 @@
import ImmutablePureComponent from 'react-immutable-pure-component';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { debounce } from 'lodash';
import ColumnIndicator from '../../components/column_indicator';
import ColumnIndicator from '../components/column_indicator';
import {
fetchRemovedAccounts,
expandRemovedAccounts,
removeRemovedAccount,
} from '../../actions/groups';
} from '../actions/groups';
import { FormattedMessage } from 'react-intl';
import AccountContainer from '../../containers/account_container';
import ScrollableList from '../../components/scrollable_list';
import AccountContainer from '../containers/account_container';
import ScrollableList from '../components/scrollable_list';
import { defineMessages, injectIntl } from 'react-intl';
const messages = defineMessages({

1
app/javascript/gabsocial/features/group_removed_accounts/index.js
View File

@@ -1 +0,0 @@
export { default } from './group_removed_accounts'

1
app/javascript/gabsocial/features/group_timeline/index.js
View File

@@ -1 +0,0 @@
export { default } from '../group_timeline'

1
app/javascript/gabsocial/features/groups_collection/index.js
View File

@@ -1 +0,0 @@
export { default } from '../groups_collection'

2
app/javascript/gabsocial/features/introduction/introduction.js → app/javascript/gabsocial/features/introduction.js
View File

@@ -1,7 +1,7 @@
import ReactSwipeableViews from 'react-swipeable-views';
import classNames from 'classnames';
import { FormattedMessage } from 'react-intl';
import { closeOnboarding } from '../../actions/onboarding';
import { closeOnboarding } from '../actions/onboarding';
class FrameWelcome extends Component {
static propTypes = {

2
app/javascript/gabsocial/features/introduction/index.js
View File

@@ -1 +1 @@
export { default } from './introduction'
export { default } from '../introduction'

142
app/javascript/gabsocial/features/introduction/introduction.scss
View File

@@ -1,142 +0,0 @@
.introduction {
@include flex(center, center, column);
@media screen and (max-width: 920px) {
background: darken($ui-base-color, 8%);
display: block !important;
}
&__pager {
background: darken($ui-base-color, 8%);
box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
overflow: hidden;
}
&__pager,
&__frame {
border-radius: 10px;
width: 50vw;
min-width: 920px;
@media screen and (max-width: 920px) {
min-width: 0;
width: 100%;
border-radius: 0;
box-shadow: none;
}
}
&__frame-wrapper {
opacity: 0;
transition: opacity 500ms linear;
&.active {
opacity: 1;
transition: opacity 50ms linear;
}
}
&__frame {
overflow: hidden;
}
&__illustration {
height: 50vh;
@media screen and (max-width: 630px) {
height: auto;
}
img {
object-fit: cover;
display: block;
margin: 0;
@include size(100%);
}
}
&__text {
&--columnized {
display: flex;
&>div {
flex: 1 1 33.33%;
text-align: center;
padding: 25px;
padding-bottom: 30px;
}
@media screen and (max-width: 630px) {
display: block;
padding: 15px 0;
padding-bottom: 20px;
&>div {
padding: 10px 25px;
}
}
}
h3 {
margin-bottom: 10px;
@include text-sizing(24px, 700, 1.5);
}
p {
color: $darker-text-color;
@include text-sizing(16px, 400, 24px);
code {
display: inline-block;
background: darken($ui-base-color, 8%);
font-size: 15px;
padding: 1px 3px;
@include border-design(lighten($ui-base-color, 8%), 1px, 2px);
}
}
&--centered {
padding: 25px;
padding-bottom: 30px;
text-align: center;
}
}
&__dots {
padding: 25px;
@include flex(center, center);
@media screen and (max-width: 630px) {
display: none;
}
}
&__dot {
background: transparent;
margin: 0 3px;
cursor: pointer;
@include size(14px);
@include border-design($ui-highlight-color, 1px, 14px);
&:hover {
background: lighten($ui-base-color, 8%);
}
&.active {
cursor: default;
background: $ui-highlight-color;
}
}
&__action {
padding: 0 25px 25px 25px;
@include flex(center, center);
}
}

8
app/javascript/gabsocial/features/mutes.js
View File

@@ -51,9 +51,11 @@ class Mutes extends ImmutablePureComponent {
hasMore={hasMore}
emptyMessage={<FormattedMessage id='empty_column.mutes' defaultMessage="You haven't muted any users yet." />}
>
{accountIds.map(id =>
<AccountContainer key={id} id={id} />
)}
{
accountIds.map(id =>
<AccountContainer key={id} id={id} />
)
}
</ScrollableList>
)
}

1
app/javascript/gabsocial/features/mutes/index.js
View File

@@ -1 +0,0 @@
export { default } from '../mutes'

1
app/javascript/gabsocial/features/search/index.js
View File

@@ -1 +0,0 @@
export { default } from '../search'

5
app/javascript/gabsocial/features/ui/ui.js
View File

@@ -18,9 +18,6 @@ import NotificationsContainer from '../../containers/notifications_container'
import ModalRoot from '../../components/modal/modal_root'
import PopoverRoot from '../../components/popover/popover_root'
import UploadArea from '../../components/upload_area'
// import TrendsPanel from './components/trends_panel'
// import { WhoToFollowPanel } from '../../components/panel'
// import LinkFooter from '../../components/link_footer'
import ProfilePage from '../../pages/profile_page'
import GroupPage from '../../pages/group_page'
import GroupsPage from '../../pages/groups_page'
@@ -32,7 +29,6 @@ import ListPage from '../../pages/list_page'
import ListsPage from '../../pages/lists_page'
import BasicPage from '../../pages/basic_page'
import SettingsPage from '../../pages/settings_page'
// import GroupSidebarPanel from '../groups/sidebar_panel'
import {
AccountGallery,
@@ -40,7 +36,6 @@ import {
Blocks,
CommunityTimeline,
DomainBlocks,
Explore,
Favorites,
FavoritedStatuses,
Followers,