forked from kaverti/website
Final Commit before beta release
This commit is contained in:
parent
8254ec1827
commit
83b80ccc32
|
@ -194,7 +194,7 @@ mini-br {
|
|||
>
|
||||
Games
|
||||
</router-link></trpl-para></b-navbar-item>
|
||||
<div class="navbar-item has-dropdown is-hoverable is-info">
|
||||
<div class="navbar-item has-dropdown is-hoverable is-info" type="is-info">
|
||||
<a class="navbar-link">
|
||||
<trpl-para>More</trpl-para>
|
||||
</a>
|
||||
|
@ -208,6 +208,7 @@ mini-br {
|
|||
</a>
|
||||
<router-link class="navbar-item" to='/developers'>Developers</router-link>
|
||||
<router-link class="navbar-item is-active" to='/premium'>Upgrade</router-link>
|
||||
<router-link class="navbar-item" to='/licenses'>Credits and Licenses</router-link>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -535,12 +536,15 @@ mini-br {
|
|||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang='scss'>
|
||||
@import url('https://fonts.googleapis.com/css?family=Lato:300,300i,400,400i,700');
|
||||
@import './assets/scss/variables.scss';
|
||||
$primary: #0ba8e6;
|
||||
html, body {
|
||||
@import './assets/sass/primary';
|
||||
$primary: #0ba8e6 !important;
|
||||
$colors: (
|
||||
"primary": #0ba8e6 !important
|
||||
);
|
||||
html, body {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
|
|
0
frontend/src/assets/sass/primary.sass
Normal file
0
frontend/src/assets/sass/primary.sass
Normal file
|
@ -24,7 +24,7 @@ $color__green--primary: rgba(76, 175, 80, 0.86);
|
|||
$color__green--darker: #349238;
|
||||
$color__green--darkest: #1B5E20;
|
||||
|
||||
$color__blue--primary: #42A7FF;
|
||||
$color__blue--primary: #0a8bff;
|
||||
$color__blue--darker: #0079E5;
|
||||
$color__blue--darkest: #0D47A1;
|
||||
|
||||
|
@ -182,7 +182,7 @@ $breakpoint--phone-thread: 500px;
|
|||
margin-right: 0.5rem;
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
top: -0.1rem;
|
||||
top: -0.1rem;
|
||||
|
||||
@include user-select(none);
|
||||
|
||||
|
@ -217,4 +217,4 @@ $breakpoint--phone-thread: 500px;
|
|||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<div class='input_editor__reply_username' v-if='replyUsername'>Replying to <strong>{{replyUsername}}</strong></div>
|
||||
<div class='input_editor__close input_editor__format_button' @click='closeEditor'>×</div>
|
||||
|
||||
<tab-view :tabs='["Editor", "Previewer"]' v-model='showTab' :small-tabs='true'>
|
||||
<tab-view :tabs='["Editor"]' v-model='showTab' :small-tabs='true'>
|
||||
<template slot='Editor'>
|
||||
<input-editor-core
|
||||
:value='value'
|
||||
|
@ -26,9 +26,6 @@
|
|||
@blur='setFocusInput(false)'
|
||||
></input-editor-core>
|
||||
</template>
|
||||
<template slot='Previewer'>
|
||||
<input-editor-preview :value='value' :mentions='mentions'></input-editor-preview>
|
||||
</template>
|
||||
</tab-view>
|
||||
|
||||
|
||||
|
@ -40,7 +37,6 @@
|
|||
|
||||
<script>
|
||||
import InputEditorCore from './InputEditorCore'
|
||||
import InputEditorPreview from './InputEditorPreview'
|
||||
import LoadingIcon from './LoadingIcon'
|
||||
import TabView from './TabView'
|
||||
|
||||
|
@ -50,7 +46,6 @@
|
|||
props: ['value', 'error', 'replyUsername', 'show', 'loading'],
|
||||
components: {
|
||||
InputEditorCore,
|
||||
InputEditorPreview,
|
||||
LoadingIcon,
|
||||
TabView
|
||||
},
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
<template>
|
||||
<p>The previewer is temporarily unavailable</p>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import Marked from 'marked'
|
||||
|
||||
|
|
|
@ -92,16 +92,6 @@
|
|||
<heart-button :post='post' v-if='showReply'></heart-button>
|
||||
</div>
|
||||
<div class='post__footer_sub_group' v-if='post.Replies.length'>
|
||||
<span class='post__footer_sub_group__text post__footer_sub_group__text--replies'>replies</span>
|
||||
<post-reply
|
||||
v-for='(reply, index) in post.Replies'
|
||||
:key='"post-reply-" + reply.postNumber'
|
||||
|
||||
:post='reply'
|
||||
:hover='hover'
|
||||
:first='index === 0'
|
||||
@click='$emit("goToPost", reply.postNumber)'
|
||||
></post-reply>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
@ -133,7 +123,6 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import PostReply from './PostReply'
|
||||
import HeartButton from './HeartButton'
|
||||
import ModalWindow from './ModalWindow'
|
||||
import FancyInput from './FancyInput'
|
||||
|
@ -153,7 +142,6 @@
|
|||
'allowQuote'
|
||||
],
|
||||
components: {
|
||||
PostReply,
|
||||
ModalWindow,
|
||||
FancyInput,
|
||||
ReplyingTo,
|
||||
|
@ -206,7 +194,7 @@
|
|||
if(text.length) {
|
||||
this.quoteY = coords.top - rootCoords.top - 30;
|
||||
this.quoteX = coords.left - rootCoords.left;
|
||||
this.quoteSelection = '> ' + text.replace(/\n/g, '\n> ') + '\n\n';
|
||||
this.quoteSelection = '~ ' + text.replace(/\n/g, '\n~ ') + '\n\n';
|
||||
this.showQuote = true;
|
||||
} else {
|
||||
this.showQuote = false;
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -88,12 +88,6 @@
|
|||
@blur='setFocusInput(false)'
|
||||
></input-editor-core>
|
||||
</div>
|
||||
<div class='editor__preview'>
|
||||
<div class='editor__format_bar editor__format_bar--preview'>
|
||||
previewer
|
||||
</div>
|
||||
<input-editor-preview :value='editor' :mentions='mentions'></input-editor-preview>
|
||||
</div>
|
||||
</div>
|
||||
<error-tooltip :error='errors.content' class='editor_error'></error-tooltip>
|
||||
|
||||
|
@ -103,7 +97,6 @@
|
|||
|
||||
<script>
|
||||
import InputEditorCore from '../InputEditorCore'
|
||||
import InputEditorPreview from '../InputEditorPreview'
|
||||
import FancyInput from '../FancyInput'
|
||||
import SelectButton from '../SelectButton'
|
||||
import LoadingButton from '../LoadingButton'
|
||||
|
@ -116,7 +109,6 @@
|
|||
name: 'ThreadNew',
|
||||
components: {
|
||||
InputEditorCore,
|
||||
InputEditorPreview,
|
||||
SelectButton,
|
||||
FancyInput,
|
||||
LoadingButton,
|
||||
|
@ -395,7 +387,7 @@
|
|||
}
|
||||
|
||||
@at-root #{&}__input {
|
||||
width: 50%;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
|
||||
.input_editor_core__format_bar {
|
||||
|
@ -408,7 +400,6 @@
|
|||
|
||||
@at-root #{&}__preview {
|
||||
border-left: 1px solid $color__gray--darker;
|
||||
width: 50%;
|
||||
|
||||
div.input_editor_preview__markdownHTML {
|
||||
height: 14.1rem;
|
||||
|
|
|
@ -70,6 +70,10 @@ let Errors = {
|
|||
'Registrations disabled, bro',
|
||||
400
|
||||
],
|
||||
lockedCategory: [
|
||||
'This category is locked, only admins can post here, however, you can still respond to existing threads if they aren\'t locked',
|
||||
400
|
||||
],
|
||||
passwordSame: [
|
||||
'What\'s the point of changing your password if you\'re going to change it to what it already is.',
|
||||
400
|
||||
|
|
1647
licenses.html
Normal file
1647
licenses.html
Normal file
File diff suppressed because it is too large
Load diff
|
@ -120,4 +120,4 @@ module.exports = (sequelize, DataTypes) => {
|
|||
})
|
||||
|
||||
return Post
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ router.post('/', async (req, res, next) => {
|
|||
value: req.body.category
|
||||
}})
|
||||
if(!category) throw Errors.invalidCategory
|
||||
if(category.locked && !req.session.admin) throw Errors.threadLocked
|
||||
if(category.locked && !req.session.admin) throw Errors.lockedCategory
|
||||
|
||||
let user = await User.findOne({ where: {
|
||||
username: req.session.username
|
||||
|
|
Loading…
Reference in a new issue