mirror of
https://github.com/HangarMC/Hangar.git
synced 2025-03-13 15:39:18 +08:00
removed a bunch more replaced stuff
This commit is contained in:
Jake Potrebic
parent
b8aef229c0
commit
f4edb2b6f3
@ -1,99 +0,0 @@
|
||||
<template>
|
||||
<div class="btn-group">
|
||||
<button
|
||||
class="btn btn-sm btn-light dropdown-toggle"
|
||||
id="visibility-actions"
|
||||
type="button"
|
||||
data-toggle="dropdown"
|
||||
aria-haspopup="true"
|
||||
aria-expanded="false"
|
||||
>
|
||||
<i class="fas fa-eye"></i> Change Visibility
|
||||
</button>
|
||||
<div class="dropdown-menu" aria-labelledby="visibility-actions">
|
||||
<a
|
||||
v-for="visibility in visibilityValues"
|
||||
:key="visibility.name"
|
||||
href="#"
|
||||
@click.prevent="
|
||||
visibility.showModal ? (selected = visibility.name) : visibility.name === projectVisibility ? '' : changeVisibility(visibility.name)
|
||||
"
|
||||
class="dropdown-item"
|
||||
:data-toggle="visibility.showModal ? 'modal' : ''"
|
||||
:data-target="visibility.showModal ? '#modal-visibility-comment' : ''"
|
||||
>
|
||||
<i v-show="visibility.name === projectVisibility" class="fa fa-check text-dark"></i>
|
||||
{{ $t(`visibility.name.${visibility.name}`) }}
|
||||
</a>
|
||||
</div>
|
||||
<HangarModal target-id="modal-visibility-comment" label-id="modal-visibility-comment">
|
||||
<template v-slot:modal-content>
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Comment</h4>
|
||||
<button type="button" class="close" data-dismiss="modal" :aria-label="$t('general.close')">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<textarea v-model.trim="comment" class="form-control" rows="3" aria-labelledby="modal-visibility-comment"></textarea>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<div class="btn-group">
|
||||
<button class="btn btn-default" data-dismiss="modal" v-text="$t('general.close')"></button>
|
||||
<button class="btn btn-primary" :disabled="!comment" @click="changeVisibility(selected)">
|
||||
<i class="fas fa-pencil-alt"></i> Submit
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</HangarModal>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import axios from 'axios';
|
||||
import { stringify } from 'qs';
|
||||
|
||||
import { Visibility } from '@/enums';
|
||||
import HangarModal from '@/components/HangarModal';
|
||||
|
||||
export default {
|
||||
name: 'BtnHide',
|
||||
components: { HangarModal },
|
||||
props: {
|
||||
namespace: String,
|
||||
projectVisibility: String,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
selected: null,
|
||||
visibilityValues: Visibility.values,
|
||||
comment: null,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
changeVisibility(visibility) {
|
||||
const url = `/${this.namespace}/visible/${visibility}`;
|
||||
axios
|
||||
.post(
|
||||
url,
|
||||
stringify({
|
||||
comment: this.comment,
|
||||
}),
|
||||
{
|
||||
headers: {
|
||||
[window.csrfInfo.headerName]: window.csrfInfo.token,
|
||||
'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
|
||||
},
|
||||
}
|
||||
)
|
||||
.then(() => {
|
||||
location.reload();
|
||||
})
|
||||
.catch(() => {
|
||||
console.error('Error changing project visibility');
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
@ -1,319 +0,0 @@
|
||||
<template>
|
||||
<template v-if="enabled">
|
||||
<!-- Edit -->
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-edit btn-page btn-default"
|
||||
:class="{ open: editing && !previewing }"
|
||||
:title="$t('general.edit')"
|
||||
@click.stop="edit"
|
||||
>
|
||||
<i class="fas fa-edit"></i><span v-text="$t('general.edit')"></span>
|
||||
</button>
|
||||
|
||||
<!-- Preview -->
|
||||
<transition name="button-hide">
|
||||
<div v-if="editing" class="btn-edit-container btn-preview-container" :class="{ open: previewing }" :title="$t('general.preview')">
|
||||
<button type="button" class="btn btn-sm btn-preview btn-page btn-default" @click.stop="preview">
|
||||
<i v-show="loading.preview" class="fas fa-loading"></i>
|
||||
<i v-show="!loading.preview" class="fas fa-eye"></i>
|
||||
</button>
|
||||
</div>
|
||||
</transition>
|
||||
|
||||
<transition name="button-hide">
|
||||
<div v-if="saveable && editing" class="btn-edit-container btn-save-container" :title="$t('general.save')">
|
||||
<button form="form-editor-save" type="submit" class="btn btn-sm btn-save btn-page btn-default">
|
||||
<i class="fas fa-save"></i>
|
||||
</button>
|
||||
</div>
|
||||
</transition>
|
||||
|
||||
<transition name="button-hide">
|
||||
<div v-if="cancellable && editing" class="btn-edit-container btn-cancel-container" :title="$t('general.cancel')">
|
||||
<button type="button" class="btn btn-sm btn-cancel btn-page btn-default" @click.stop="cancel">
|
||||
<i class="fas fa-times"></i>
|
||||
</button>
|
||||
</div>
|
||||
</transition>
|
||||
|
||||
<transition name="button-hide">
|
||||
<template v-if="deletable && editing">
|
||||
<div class="btn-edit-container btn-delete-container" :title="$t('general.delete')">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-page-delete btn-page btn-default"
|
||||
data-toggle="modal"
|
||||
data-target="#modal-page-delete"
|
||||
style="color: var(--danger)"
|
||||
>
|
||||
<i class="fas fa-trash"></i>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
</transition>
|
||||
|
||||
<!-- Edit window -->
|
||||
<div v-show="editing && !previewing" class="page-edit page-content-view" style="padding-top: 10px">
|
||||
<textarea name="content" class="form-control" :form="targetForm || 'form-editor-save'" v-model="content"></textarea>
|
||||
</div>
|
||||
<div v-show="editing && previewing" class="page-preview page-rendered page-content-view" v-html="previewContent" style="margin-top: 10px"></div>
|
||||
|
||||
<HangarForm v-if="saveable" method="post" :action="saveCall" id="form-editor-save">
|
||||
<input v-if="extraFormValue" type="hidden" :value="extraFormValue" name="name" />
|
||||
</HangarForm>
|
||||
|
||||
<teleport to="body">
|
||||
<div v-if="deletable" class="modal fade" id="modal-page-delete" tabindex="-1" role="dialog" aria-labelledby="label-page-delete">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title" id="label-page-delete">Delete {{ subject.toLowerCase() }}</h4>
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">Are you sure you want to delete this {{ subject.toLowerCase() }}? This cannot be undone.</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
|
||||
<HangarForm method="post" :action="deleteCall" clazz="form-inline">
|
||||
<button type="submit" class="btn btn-danger">Delete</button>
|
||||
</HangarForm>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</teleport>
|
||||
</template>
|
||||
<div v-show="!editing" class="page-content page-rendered page-content-view" v-html="preCooked"></div>
|
||||
</template>
|
||||
<script>
|
||||
import { nextTick } from 'vue';
|
||||
import HangarForm from '@/components/HangarForm';
|
||||
import axios from 'axios';
|
||||
|
||||
export default {
|
||||
name: 'Editor',
|
||||
components: {
|
||||
HangarForm,
|
||||
},
|
||||
emits: ['update:contentProp'],
|
||||
props: {
|
||||
saveCall: String,
|
||||
deleteCall: String,
|
||||
saveable: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
deletable: Boolean,
|
||||
enabled: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
raw: String,
|
||||
subject: String,
|
||||
cancellable: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
targetForm: String,
|
||||
extraFormValue: String,
|
||||
contentProp: String,
|
||||
open: Boolean,
|
||||
},
|
||||
watch: {
|
||||
preCooked() {
|
||||
this.$nextTick(() => {
|
||||
window.admonition();
|
||||
});
|
||||
},
|
||||
previewContent() {
|
||||
this.$nextTick(() => {
|
||||
window.admonition();
|
||||
});
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
content: {
|
||||
get() {
|
||||
if (typeof this.contentProp !== 'undefined') {
|
||||
return this.contentProp;
|
||||
} else {
|
||||
return this.inputContent;
|
||||
}
|
||||
},
|
||||
set(val) {
|
||||
if (typeof this.contentProp !== 'undefined') {
|
||||
this.$emit('update:contentProp', val);
|
||||
} else {
|
||||
this.inputContent = val;
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
editing: false,
|
||||
previewing: false,
|
||||
inputContent: null,
|
||||
preCooked: null,
|
||||
previewContent: null,
|
||||
loading: {
|
||||
preview: false,
|
||||
},
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
edit() {
|
||||
this.editing = true;
|
||||
this.previewing = false;
|
||||
},
|
||||
async preview() {
|
||||
this.previewing = true;
|
||||
this.previewContent = await this.getPreview(this.content);
|
||||
this.$nextTick(() => this.renderKatex());
|
||||
},
|
||||
async cancel() {
|
||||
this.previewing = false;
|
||||
await nextTick();
|
||||
this.editing = false;
|
||||
},
|
||||
async getPreview(content) {
|
||||
if (content && content.trim().length > 0) {
|
||||
this.loading.preview = true;
|
||||
const res = await axios.post(
|
||||
'/pages/preview',
|
||||
{ raw: content },
|
||||
{
|
||||
headers: {
|
||||
[window.csrfInfo.headerName]: window.csrfInfo.token,
|
||||
},
|
||||
}
|
||||
);
|
||||
this.loading.preview = false;
|
||||
return res.data;
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
},
|
||||
renderKatex() {
|
||||
const mathElems = document.getElementsByClassName('katex');
|
||||
const elems = [];
|
||||
for (const i in mathElems) {
|
||||
if (Object.prototype.hasOwnProperty.call(mathElems, i)) elems.push(mathElems[i]);
|
||||
}
|
||||
|
||||
elems.forEach((elem) => {
|
||||
// eslint-disable-next-line
|
||||
katex.render(elem.textContent, elem, { throwOnError: false, displayMode: elem.nodeName !== 'SPAN' });
|
||||
});
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
this.content = this.raw;
|
||||
this.preCooked = await this.getPreview(this.raw);
|
||||
if (this.open) {
|
||||
this.edit();
|
||||
}
|
||||
|
||||
this.$nextTick(() => this.renderKatex());
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
@import '../scss/utils';
|
||||
|
||||
.btn-edit-container {
|
||||
margin-left: -34px;
|
||||
z-index: -1;
|
||||
|
||||
&.open {
|
||||
z-index: 0;
|
||||
}
|
||||
|
||||
&.open .btn-page {
|
||||
border-right-color: white;
|
||||
}
|
||||
|
||||
&:not(.open) .btn-page {
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
}
|
||||
.btn-edit {
|
||||
@include towardsBottomRight(-47px, 20px);
|
||||
position: absolute;
|
||||
|
||||
&.open {
|
||||
border-right-color: white;
|
||||
}
|
||||
|
||||
&:not(.open) {
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
}
|
||||
|
||||
.page-edit textarea {
|
||||
resize: vertical;
|
||||
}
|
||||
|
||||
button.open:hover {
|
||||
background-color: white;
|
||||
cursor: default;
|
||||
border-color: $light;
|
||||
}
|
||||
|
||||
.btn-page {
|
||||
@include transition6(border-color, ease-in-out, 0.15s, box-shadow, ease-in-out, 0.15s);
|
||||
border-radius: 4px 0 0 4px;
|
||||
padding: 6px;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
.btn-page:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.btn-edit-container {
|
||||
position: absolute;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.btn-edit-container .btn {
|
||||
width: 35px;
|
||||
}
|
||||
|
||||
.btn-preview-container {
|
||||
margin-top: 58px;
|
||||
}
|
||||
.btn-save-container {
|
||||
margin-top: 96px;
|
||||
}
|
||||
.btn-cancel-container {
|
||||
margin-top: 135px;
|
||||
}
|
||||
.btn-delete-container {
|
||||
margin-top: 175px;
|
||||
}
|
||||
|
||||
.btn-page-delete {
|
||||
color: #c12e2a;
|
||||
}
|
||||
|
||||
.button-hide-enter-active {
|
||||
transition: all 0.3s ease-out;
|
||||
}
|
||||
|
||||
.button-hide-leave-active {
|
||||
transition: all 0.3s ease-in;
|
||||
}
|
||||
|
||||
.button-hide-leave-to {
|
||||
z-index: -1;
|
||||
}
|
||||
|
||||
.button-hide-enter-from,
|
||||
.button-hide-leave-to {
|
||||
transform: translateX(34px);
|
||||
}
|
||||
</style>
|
||||
@ -1,25 +0,0 @@
|
||||
<template>
|
||||
<form :action="action" :method="method" :enctype="enctype" :id="id" :class="clazz" :autocomplete="noAutocomplete ? 'off' : 'on'">
|
||||
<input type="hidden" :name="name" :value="value" />
|
||||
<slot></slot>
|
||||
</form>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
name: 'HangarForm',
|
||||
props: {
|
||||
action: String,
|
||||
method: String,
|
||||
enctype: String,
|
||||
id: String,
|
||||
clazz: String,
|
||||
noAutocomplete: Boolean,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
name: window.csrfInfo.parameterName,
|
||||
value: window.csrfInfo.token,
|
||||
};
|
||||
},
|
||||
};
|
||||
</script>
|
||||
@ -1,30 +0,0 @@
|
||||
<template>
|
||||
<a :href="linkUrl">
|
||||
<img class="user-avatar" :class="extraClasses" :src="src" :alt="name" />
|
||||
</a>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: {
|
||||
src: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
href: String,
|
||||
extraClasses: String,
|
||||
name: String,
|
||||
},
|
||||
computed: {
|
||||
linkUrl: function () {
|
||||
if (this.href != null) {
|
||||
return this.href;
|
||||
} else if (this.name != null) {
|
||||
return window.ROUTES.parse('USERS_SHOW_PROJECTS', this.name);
|
||||
} else {
|
||||
return '#';
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
@ -1,25 +0,0 @@
|
||||
<template>
|
||||
<div class="tags" :class="{ 'has-addons': data }">
|
||||
<span
|
||||
v-bind:style="{
|
||||
color: color.foreground,
|
||||
background: color.background,
|
||||
'border-color': color.background,
|
||||
}"
|
||||
class="tag"
|
||||
>
|
||||
{{ name }}
|
||||
</span>
|
||||
<span v-if="data" class="tag">{{ data }}</span>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: {
|
||||
name: String,
|
||||
data: String,
|
||||
color: Object,
|
||||
},
|
||||
};
|
||||
</script>
|
||||
@ -1,23 +0,0 @@
|
||||
import { createApp } from 'vue';
|
||||
import ProjectControls from '@/components/entrypoints/projects/ProjectControls';
|
||||
import { setupI18n } from '@/plugins/i18n';
|
||||
|
||||
const mountPoint = document.getElementById('project-controls');
|
||||
if (mountPoint) {
|
||||
const i18n = setupI18n();
|
||||
createApp(ProjectControls, {
|
||||
visibility: mountPoint.dataset.visibility,
|
||||
hasUser: mountPoint.dataset.hasUser === 'true',
|
||||
isOwner: mountPoint.dataset.isOwner === 'true',
|
||||
isStarred: mountPoint.dataset.isStarred === 'true',
|
||||
isWatching: mountPoint.dataset.isWatching === 'true',
|
||||
hasUserFlags: mountPoint.dataset.hasUserFlags === 'true',
|
||||
starCount: parseInt(mountPoint.dataset.starCount),
|
||||
flagCount: parseInt(mountPoint.dataset.flagCount),
|
||||
noteCount: parseInt(mountPoint.dataset.noteCount),
|
||||
hasModNotes: mountPoint.dataset.hasModNotes === 'true',
|
||||
hasViewLogs: mountPoint.dataset.hasViewLogs === 'true',
|
||||
})
|
||||
.use(i18n)
|
||||
.mount('#project-controls');
|
||||
}
|
||||
@ -151,12 +151,6 @@ public class WebConfig extends WebMvcConfigurationSupport {
|
||||
super.addDefaultHttpMessageConverters(converters);
|
||||
}
|
||||
|
||||
// @Override
|
||||
// protected void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
|
||||
// argumentResolvers.addAll(0, resolvers);
|
||||
// }
|
||||
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
protected RequestMappingHandlerAdapter createRequestMappingHandlerAdapter() {
|
||||
@ -184,6 +178,7 @@ public class WebConfig extends WebMvcConfigurationSupport {
|
||||
return restTemplate;
|
||||
}
|
||||
|
||||
// TODO remove
|
||||
@Bean
|
||||
public UserLockExceptionResolver userLockExceptionResolver() {
|
||||
return new UserLockExceptionResolver();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user