Skip to content

Fix some issues on open.crowd.dev #41

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

Merged
merged 11 commits into from
Sep 9, 2022
Merged

Fix some issues on open.crowd.dev #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f7610c0
Add some fixes to conversations
mariobalca Sep 5, 2022
51cafd6
Remove unused import
mariobalca Sep 5, 2022
a97c4c0
Fix markdown dependency
mariobalca Sep 5, 2022
ea224cf
One more attempt to address markdown
mariobalca Sep 5, 2022
2818a9f
Revert claim.vue changes
mariobalca Sep 5, 2022
aa92f47
Remove frontend/cypress
mariobalca Sep 5, 2022
8a26fd2
One more attempt to fix issues
mariobalca Sep 5, 2022
07fd3c9
Attemp to fix package-lock.json
mariobalca Sep 5, 2022
2092c5e
One more attempt
mariobalca Sep 5, 2022
8d60b58
One more attempt
mariobalca Sep 5, 2022
efa5127
Fix logos bg colors and markdown
mariobalca Sep 6, 2022
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
5 changes: 2 additions & 3 deletions premium/conversations/components/claim.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
class="rounded-lg flex items-center justify-center h-full m-6 md:m-10 border border-transparent hover:opacity-80 hover:cursor-pointer shadow-md hover:shadow-lg"
:style="{
backgroundColor:
tenant.theme && tenant.theme.bgNav !== '#140505'
tenant.theme && tenant.theme.bgNav && tenant.logoUrl
? tenant.theme.bgNav
: tenant.cardColor
? tenant.cardColor
Expand Down Expand Up @@ -49,8 +49,7 @@
import topHeader from "~~/components/topHeader.vue";
import mainSection from "~~/components/mainSection.vue";
import { getBgColor, getTextColor } from "../helpers/avatarColors";

import _ from "lodash";
import makeStyles from "~~/helpers/makeStyles";
import MainCta from "~~/components/mainCta.vue";

export default defineComponent({
Expand Down
19 changes: 9 additions & 10 deletions premium/conversations/components/conversation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
class="min-w-0 flex-1 pt-1.5 flex justify-between space-x-4"
>
<div>
<p
v-html="activity.body"
<div
v-html="markdown(activity.body)"
class="myem text-sm"
:style="colors('color:text')"
/>
Expand Down Expand Up @@ -188,17 +188,12 @@
</template>

<script>
import {
FireIcon,
ChevronRightIcon,
ReplyIcon,
ExternalLinkIcon,
EyeIcon,
} from "@heroicons/vue/solid";
import Showdown from 'showdown'
import {ChevronRightIcon, ExternalLinkIcon, EyeIcon, FireIcon, ReplyIcon,} from "@heroicons/vue/solid";
import Avatar from "./avatar.vue";
import PlatformIcon from "./platformIcon.vue";
import ConversationWrapper from "./conversationWrapper.vue";
import { defineComponent } from "@vue/composition-api";
import {defineComponent} from "@vue/composition-api";
import makeStyles from "~~/helpers/makeStyles";

export default defineComponent({
Expand Down Expand Up @@ -254,6 +249,10 @@ export default defineComponent({
? this.conversation.activities.slice(0, this.maxContributors)
: this.conversation.activities;
},
markdown(body) {
const converter = new Showdown.Converter({ simpleLineBreaks: true })
return converter.makeHtml(body)
}
},

computed: {
Expand Down
2 changes: 1 addition & 1 deletion premium/conversations/components/conversationDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export default defineComponent({
this.isLoaded.mode = false;
},
truncatedTitle() {
const first50Chars = this.conversation.title.substr(50)
const first50Chars = this.conversation.title.substr(0, 50)
if (first50Chars.substr(47, 50).includes('...')) {
return first50Chars
} else {
Expand Down
Loading