Skip to content
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

apps/userdashboard: adding moderation detail page with dummy data - i… #94

Merged
merged 1 commit into from
Apr 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import React, { Component } from 'react'
import django from 'django'

export default class ModerationComment extends Component {
constructor (props) {
super(props)

this.state = {
project: this.props.key
}
}

render () {
const postedText = django.gettext(' posted a ')
const offensiveText = django.gettext(' for being offensive')
const categoryText = django.gettext('Categories: ')
const blockText = django.gettext(' Block')
const dismissText = django.gettext(' Dismiss')
const replyText = django.gettext(' Reply')

return (
<div className="mt-5">
<ul className="pl-0">
<li className="list-item ">
<div className="row">
<div className="col-2 col-md-1">
<div className="user-avatar user-avatar--small user-avatar--shadow mb-1 userindicator__btn-img" />
</div>
<div className="col-7 col-md-8">
<div><span className="fa-stack fa-2x" aria-hidden="true"><i className="fas fa-exclamation fa-stack-1x" /><i className="far fa-circle fa-stack-2x" /></span>
<a href="/">Profile name</a>
<span>{postedText}<a href="/">comment link</a>{offensiveText}</span>
</div>
<div>8.4.2021, 14:09</div>
</div>
</div>
<div className="row">
<div className="a4-comments__box--comment">
<div className="col-12">
<span className="sr-only">{categoryText}</span>
<span className="badge a4-comments__badge a4-comments__badge--que">Category</span>
</div>
</div>
</div>
<div className="row">
<div className="col-12">
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliter homines, aliter philosophos loqui putas oportere? Igitur neque stultorum quisquam beatus neque sapientium non beatus.</p>
</div>
</div>
<div className="text-muted mt-3 d-flex justify-content-between">
<div><i className="fas fa-reply" aria-hidden="true" />{replyText}</div>
<div><i className="far fa-times-circle" aria-hidden="true" />{dismissText}</div>
<div><i className="fas fa-ban" aria-hidden="true" />{blockText}</div>
</div>
</li>
</ul>
</div>
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react'
import django from 'django'

import ModerationComment from './ModerationComment'

export default function (props) {
const byText = django.gettext('By ')

return (
<div className="row mb-2">
philli-m marked this conversation as resolved.
Show resolved Hide resolved
<div className="col-12">
<h1 className="m-0">project title</h1>
<span className="text-muted">{byText}organisation</span>
<ModerationComment />
</div>
</div>
)
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* global fetch */
import React from 'react'
import React, { Component } from 'react'
import django from 'django'

export default class ModerationProjects extends React.Component {
export default class ModerationProjects extends Component {
constructor (props) {
super(props)

Expand Down Expand Up @@ -65,10 +65,10 @@ export default class ModerationProjects extends React.Component {
}

return (
<div className="mb-2">
<h2>Projects</h2>
<div className="row" id="project_list">
<ul className="col-12">
<div className="row">
<div className="col-12">
<h3 className="mt-sm-0">Projects</h3>
<ul className="pl-0">
{items.map(item => (
<li key={item.title} className="tile--sm tile--horizontal">
<div className="tile__head">
Expand All @@ -78,7 +78,7 @@ export default class ModerationProjects extends React.Component {
</div>
<div className="tile__body">
<span className="text-muted">{byText}{item.organisation}</span>
<h3 className="tile__title mb-4">{item.offensive > 0 && <span className="text-info">• </span>}{item.title}</h3>
<h3 className="tile__title mb-4">{item.offensive > 0 && <span className="text-info">• </span>}<a href={item.detail}>{item.title}</a></h3>
<div>
{item.access === 1 && <span className="label label--dark">{publicText}</span>}
{item.access === 2 && <span className="label label--dark">{semiPrivateText}</span>}
Expand All @@ -93,7 +93,6 @@ export default class ModerationProjects extends React.Component {
</div>
<a href={item.url} className="tile__link"><span className="sr-only">{srLinkText}{item.title}</span></a>
</div>

</li>
))}
</ul>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import ModerationCommentList from './ModerationCommentList'
import React from 'react'
import ReactDOM from 'react-dom'

function init () {
$('[data-aplus-widget="moderation_comment_list"]').each(function (i, element) {
const moderationCommentList = element.getAttribute('data-moderation-comment-list')
const projectApiUrl = element.getAttribute('data-project-api-url')
ReactDOM.render(
<ModerationCommentList
moderationCommentList={moderationCommentList}
projectApiUrl={projectApiUrl}
/>,
element)
})
}

document.addEventListener('DOMContentLoaded', init, false)
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% has_perm 'a4_candy_userdashboard.view_moderation_dashboard' user as user_is_moderator %}
{% if user_is_moderator %}
<a href="{% url 'userdashboard-moderation' %}"
class="tab {% ifequal view.menu_item 'moderation' %}active{% endifequal %}">
class="tab {% if view.menu_item == 'moderation' or '/detail' in request.get_full_path %}active{% endif %}">
{% trans 'Moderation' %}
</a>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{% extends "a4_candy_userdashboard/base_userdashboard.html" %}
{% load i18n static %}

{% block extra_js %}
{{ block.super }}
<script type="text/javascript" src="{% static 'moderation_comment_list.js' %}"></script>
{% endblock %}

{% block dashboard_content %}
<a class="btn btn--none pl-0 pt-0" href="{% url 'userdashboard-moderation' %}">
<i class="fa fa-chevron-left" aria-hidden="true"></i>
<span>{% trans 'Back' %}</span>
</a>
<div data-aplus-widget="moderation_comment_list"
data-moderation-projects="{{ moderation_comment_list }}"
data-project-api-url="{{ project_api_url }}" >
</div>
{% endblock %}
3 changes: 3 additions & 0 deletions apps/userdashboard/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@
url(r'^overview/following/$',
views.UserDashboardFollowingView.as_view(),
name='userdashboard-following'),
url(r'^moderation/detail/$',
views.UserDashboardModerationDetailView.as_view(),
name='userdashboard-moderation-detail'),
]
9 changes: 9 additions & 0 deletions apps/userdashboard/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,12 @@ def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['project_api_url'] = reverse('moderationprojects-list')
return context


class UserDashboardModerationDetailView(UserDashboardBaseMixin,
rules_mixins.PermissionRequiredMixin):

template_name = (
'a4_candy_userdashboard/userdashboard_moderation_detail.html'
)
permission_required = 'a4_candy_userdashboard.view_moderation_dashboard'
5 changes: 5 additions & 0 deletions webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ module.exports = {
import: [
'./apps/userdashboard/assets/js/a4_candy_userdashboard/react_moderation_projects.jsx'
]
},
moderation_comment_list: {
import: [
'./apps/userdashboard/assets/js/a4_candy_userdashboard/react_moderation_comment_list.jsx'
]
}
},
output: {
Expand Down