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.

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

Jump to bottom

fix(deps): bump actions/checkout from 2 to 4 #141

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix(deps): bump actions/checkout from 2 to 4 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98aa82d
fix: added missing titles in diffview of v2
technikhil314 Dec 5, 2023
bd9dc74
fix(deps): bump actions/checkout from 2 to 4
dependabot[bot] Feb 5, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: create release on tag

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# This action generates changelog which then the release action consumes
- name: Conventional Changelog Action
Expand Down
52 changes: 46 additions & 6 deletions pages/v2/diff.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,45 @@
<main class="outline-none" tabindex="0">
<DiffActionBar :diff-navigator="diffNavigator" />
<section
class="flex items-stretch w-full gap-4 font-mono text-gray-800 dark:text-gray-50"
class="
flex
items-stretch
flex-wrap
w-full
gap-4
font-mono
text-gray-800
dark:text-gray-50
"
>
<div class="flex space-around w-full gap-4">
<p
class="
flex-grow-0 flex-shrink-0
w-1/2
text-lg
font-bold
text-center
capitalize
break-all
"
>
<span class="inline-block w-4/5">{{ lhsLabel }}</span>
</p>
<p
class="
flex-grow-0 flex-shrink-0
w-1/2
text-lg
font-bold
text-center
capitalize
break-all
"
>
<span class="inline-block w-4/5">{{ rhsLabel }}</span>
</p>
</div>
<div
id="monaco-diff-viewer"
class="w-full h-screen p-2 border border-gray-600 rounded-md editor"
Expand All @@ -19,7 +56,10 @@
import pako from 'pako'
import loader from '@monaco-editor/loader'
import Vue from 'vue'
import { getMonacoEditorDefaultOptions, undoUrlSafeBase64 } from '../../helpers/utils'
import {
getMonacoEditorDefaultOptions,
undoUrlSafeBase64,
} from '../../helpers/utils'
import DiffActionBar from '~/components/v2/diffActionBar.vue'
import Navbar from '~/components/v2/navbar.vue'
import { v2DiffData } from '~/helpers/types'
Expand All @@ -28,8 +68,8 @@ export default Vue.extend({
layout: 'main',
data(): v2DiffData {
return {
lhs: "",
rhs: "",
lhs: '',
rhs: '',
rhsLabel: '',
lhsLabel: '',
monacoDiffEditor: {},
Expand All @@ -53,7 +93,7 @@ export default Vue.extend({
mounted() {
const monacoDiffViewerEl = document.getElementById('monaco-diff-viewer')
const theme = this.$cookies.isDarkMode ? 'vs-dark' : 'light'
const monacoEditorOptions = getMonacoEditorDefaultOptions(theme);
const monacoEditorOptions = getMonacoEditorDefaultOptions(theme)
loader.init().then((monaco) => {
if (monacoDiffViewerEl) {
this.monacoDiffEditor = monaco.editor.createDiffEditor(
Expand All @@ -62,7 +102,7 @@ export default Vue.extend({
...monacoEditorOptions,
readOnly: true,
wordWrap: 'on',
diffAlgorithm: 'advanced'
diffAlgorithm: 'advanced',
}
) as any
if (this.monacoDiffEditor) {
Expand Down