Compare commits
No commits in common. "c9087edd3ca06b61a381d08f795e2dbf6b46ff79" and "4aef5700962ee31503bb866f063fce4a16c068f3" have entirely different histories.
c9087edd3c
...
4aef570096
|
@ -64,11 +64,6 @@ module.exports = {
|
||||||
usernameLength: [2, 24],
|
usernameLength: [2, 24],
|
||||||
usernamePattern: /^[a-zA-Z0-9_-]+$/,
|
usernamePattern: /^[a-zA-Z0-9_-]+$/,
|
||||||
},
|
},
|
||||||
psa: {
|
|
||||||
text: 'Welcome to traxxx!', // html enabled
|
|
||||||
type: 'notice', // notice, alert
|
|
||||||
enabled: false,
|
|
||||||
},
|
|
||||||
stashes: {
|
stashes: {
|
||||||
nameLength: [2, 24],
|
nameLength: [2, 24],
|
||||||
namePattern: /^[a-zA-Z0-9!?$&\s_-]+$/,
|
namePattern: /^[a-zA-Z0-9!?$&\s_-]+$/,
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{
|
{
|
||||||
"name": "traxxx-web",
|
"name": "traxxx-web",
|
||||||
"version": "0.23.3",
|
"version": "0.23.2",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"version": "0.23.3",
|
"version": "0.23.2",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@brillout/json-serializer": "^0.5.8",
|
"@brillout/json-serializer": "^0.5.8",
|
||||||
"@dicebear/collection": "^7.0.5",
|
"@dicebear/collection": "^7.0.5",
|
||||||
|
|
|
@ -77,5 +77,5 @@
|
||||||
"postcss-custom-media": "^10.0.2",
|
"postcss-custom-media": "^10.0.2",
|
||||||
"postcss-nesting": "^12.0.2"
|
"postcss-nesting": "^12.0.2"
|
||||||
},
|
},
|
||||||
"version": "0.23.3"
|
"version": "0.23.2"
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,13 +16,6 @@
|
||||||
ref="content"
|
ref="content"
|
||||||
class="content"
|
class="content"
|
||||||
>
|
>
|
||||||
<p
|
|
||||||
v-if="psa.enabled"
|
|
||||||
class="psa"
|
|
||||||
:class="{ [psa.type]: true }"
|
|
||||||
v-html="psa.text"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<slot @scroll="scroll" />
|
<slot @scroll="scroll" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -46,12 +39,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import {
|
import { ref, onMounted, nextTick } from 'vue';
|
||||||
ref,
|
|
||||||
onMounted,
|
|
||||||
nextTick,
|
|
||||||
inject,
|
|
||||||
} from 'vue';
|
|
||||||
|
|
||||||
import events from '#/src/events.js';
|
import events from '#/src/events.js';
|
||||||
|
|
||||||
|
@ -59,9 +47,6 @@ import Header from '#/components/header/header.vue';
|
||||||
import Sidebar from '#/components/sidebar/sidebar.vue';
|
import Sidebar from '#/components/sidebar/sidebar.vue';
|
||||||
import BottomNavigation from '#/components/footer/navigation.vue';
|
import BottomNavigation from '#/components/footer/navigation.vue';
|
||||||
|
|
||||||
const pageContext = inject('pageContext');
|
|
||||||
const { psa } = pageContext.env;
|
|
||||||
|
|
||||||
const content = ref(null);
|
const content = ref(null);
|
||||||
const feedback = ref(null);
|
const feedback = ref(null);
|
||||||
const feedbackContainer = ref(null);
|
const feedbackContainer = ref(null);
|
||||||
|
@ -129,24 +114,6 @@ onMounted(() => {
|
||||||
transform: translate(100%, 0);
|
transform: translate(100%, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.psa {
|
|
||||||
padding: .5rem 1rem;
|
|
||||||
margin: 0;
|
|
||||||
box-shadow: inset 0 0 3px var(--shadow-weak-20);
|
|
||||||
background: var(--notice);
|
|
||||||
color: var(--text-light);
|
|
||||||
text-align: center;
|
|
||||||
font-weight: bold;
|
|
||||||
|
|
||||||
&.alert {
|
|
||||||
background: var(--warn);
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: inherit;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
|
|
@ -198,7 +198,6 @@ export default async function initServer() {
|
||||||
maxMatches: config.database.manticore.maxMatches,
|
maxMatches: config.database.manticore.maxMatches,
|
||||||
maxAggregateSize: config.database.manticore.maxAggregateSize,
|
maxAggregateSize: config.database.manticore.maxAggregateSize,
|
||||||
media: config.media,
|
media: config.media,
|
||||||
psa: config.psa,
|
|
||||||
},
|
},
|
||||||
meta: {
|
meta: {
|
||||||
unseenNotifications,
|
unseenNotifications,
|
||||||
|
|
Loading…
Reference in New Issue