Verified Commit d48b289b authored by Mehdi Baaboura's avatar Mehdi Baaboura
Browse files

Merge branch 'dev'

# Conflicts:
#	translations
parents 28b4550e 1083fc84
......@@ -16,7 +16,7 @@
###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=97d2bd2f0148451c0a99826ba9f65c29
VERSION=2.9.1
VERSION=2.10.0
#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
#TRUSTED_HOSTS='^localhost|example\.com$'
###< symfony/framework-bundle ###
......@@ -36,6 +36,7 @@ MAILER_URL=null://localhost
MAILER_FROM=
###< symfony/swiftmailer-bundle ###
API_ENDPOINT=https://qpostapp.com/api
POST_CHARACTER_LIMIT=300
INCREASED_POST_CHARACTER_LIMIT=1000
GIGADRIVE_APP_ID=
......@@ -66,6 +67,28 @@ MASTODON_CLIENT_ID=
MASTODON_CLIENT_SECRET=
LASTFM_CLIENT_ID=
LASTFM_CLIENT_SECRET=
SPOTIFY_CLIENT_ID=
SPOTIFY_CLIENT_SECRET=
INSTAGRAM_CLIENT_ID=
INSTAGRAM_CLIENT_SECRET=
REDDIT_CLIENT_ID=
REDDIT_CLIENT_SECRET=
YOUTUBE_CLIENT_ID=
YOUTUBE_CLIENT_SECRET=
GITLAB_HOST=gitlab.com
GITLAB_PROJECT_ID=7709191
GITLAB_TOKEN=
# Gateway config
GATEWAY_HOST=gw.qpo.st
GATEWAY_PORT=443
# Regenerate these with: php bin/console webpush:generate:keys
WEBPUSH_PUBLIC_KEY=
WEBPUSH_PRIVATE_KEY=
\ No newline at end of file
WEBPUSH_PRIVATE_KEY=
###> google/apiclient ###
GOOGLE_API_KEY=
GOOGLE_CLIENT_ID=
GOOGLE_CLIENT_SECRET=
###< google/apiclient ###
ENQUEUE_DSN=
ENQUEUE_QUEUE=
# define your env variables for the test env here
KERNEL_CLASS='qpost\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
PANTHER_APP_ENV=panther
patreon: Zeryther
ko_fi: Zeryther
github: Zeryther
\ No newline at end of file
......@@ -6,6 +6,7 @@ node_modules
public/build
assets/ts/config.json
/firebase_service_account.json
/upcoming_changelog.md
###> symfony/framework-bundle ###
......@@ -29,3 +30,5 @@ assets/ts/config.json
/gource.ppm
/gource.mp4
stream/*.log
......@@ -44,6 +44,6 @@ deploy:
- rsync -aze ssh --exclude=.git --exclude=.env.local --exclude=var --exclude=vendor --exclude=node_modules ./ ssh-gigadrivegroup@zeryther.lima-ssh.de:~/html/qpost/
- rsync -aze ssh --exclude=.git --exclude=.env.local --exclude=var --exclude=vendor --exclude=node_modules ./ root@node1.qpo.st:/home/web/qpost/
- ssh -t ssh-gigadrivegroup@zeryther.lima-ssh.de 'cd ~/html/qpost/ && /opt/lima-php/7.2/bin/php ~/phpbin/composer.phar install --no-dev && /opt/lima-php/7.2/bin/php ~/phpbin/composer.phar dump-autoload -o && /opt/lima-php/7.2/bin/php bin/console doctrine:migrations:migrate --no-interaction'
- ssh -t root@node1.qpo.st 'cd /home/web/qpost/ && composer install --no-dev && composer dump-autoload -o && chmod -R 777 ./* && php bin/console doctrine:migrations:migrate --no-interaction'
- ssh -t root@144.91.112.174 'cd /home/web/qpost/ && composer install --no-dev && composer dump-autoload -o && chmod -R 777 ./* && php bin/console doctrine:migrations:migrate --no-interaction && php bin/console messenger:stop-workers'
only:
- master
[submodule "MailTemplates"]
path = src/Mail/Templates
url = https://gitlab.com/Gigadrive/MailTemplates.git
[submodule "assets/ts/api"]
path = assets/ts/api
url = https://gitlab.com/Gigadrive/qpost/api-node.git
[submodule "translations"]
path = translations
url = https://gitlab.com/Gigadrive/qpost/locales.git
# Changelog
The changelog can be viewed [here](https://gitlab.com/Gigadrive/qpost/qpost/-/releases).
\ No newline at end of file
......@@ -2,6 +2,7 @@
[![CodeFactor](https://www.codefactor.io/repository/github/qpost/qpost/badge)](https://www.codefactor.io/repository/github/qpost/qpost)
[![License](https://img.shields.io/github/license/qpost/qpost.svg)](https://github.com/qpost/qpost)
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fqpost%2Fqpost.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fqpost%2Fqpost?ref=badge_shield)
## Requirements
- [PHP 7.2](https://php.net/)
......@@ -10,9 +11,5 @@
- [node.js](https://nodejs.org)
- [npm](https://www.npmjs.com/)
## Donations
In order to keep qpost running we rely on donations. Any bit helps!
[![Patreon](https://i.imgur.com/uA0sqOs.png)](https://patreon.com/Zeryther)
[![Ko-fi](https://i.imgur.com/8quFPiK.png)](https://ko-fi.com/Zeryther)
## License
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fqpost%2Fqpost.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fqpost%2Fqpost?ref=badge_large)
\ No newline at end of file
/*
/*!
* Copyright (C) 2018-2020 Gigadrive - All rights reserved.
* https://gigadrivegroup.com
* https://qpostapp.com
......@@ -17,42 +17,78 @@
* along with this program. If not, see <https://gnu.org/licenses/>
*/
import {JsonObject, JsonProperty} from "json2typescript";
.accountSwitcher {
.account {
$avatarSize: 48px;
$avatarMargin: 10px;
@JsonObject("MediaFile")
export default class MediaFile {
@JsonProperty("id", String)
private id: string = undefined;
@include clearfix();
@include transition(background-color .3s ease-in-out);
cursor: pointer;
padding: 10px;
@JsonProperty("sha256", String)
private sha256: string = undefined;
$border: lighten($primary, 10%);
$bg: lighten($border, 30%);
@JsonProperty("url", String)
private url: string = undefined;
@extend .rounded;
border: 3px solid transparent;
background-color: $bg;
margin-bottom: 10px;
@JsonProperty("type", String)
private type: string = undefined;
&.addNew, &.logout {
text-align: center;
}
@JsonProperty("time", String)
private time: string = undefined;
&:last-child {
margin-bottom: 0;
}
public getId(): string {
return this.id;
}
&:hover {
background-color: darken($bg, 10%);
}
public getSHA256(): string {
return this.sha256;
}
&.active {
border-color: $border;
}
public getURL(): string {
return this.url;
}
&.logout {
$border: lighten($danger, 10%);
$bg: lighten($border, 30%);
//border-color: $border;
background-color: $bg;
public getType(): string {
return this.type;
}
&:hover {
background-color: darken($bg, 10%);
}
}
.avatar {
float: left;
margin-right: $avatarMargin;
img {
@extend .rounded;
width: $avatarSize;
height: $avatarSize;
}
}
.info {
float: left;
max-width: calc(100% - #{$avatarSize} - #{$avatarMargin});
.displayName {
font-size: 18px;
font-weight: bold;
}
.userName {
color: lighten(#000, 20%);
}
public getTime(): string {
return this.time;
.displayName, .userName {
@include cutText();
}
}
}
}
\ No newline at end of file
/*!
* Copyright (C) 2018-2020 Gigadrive - All rights reserved.
* https://gigadrivegroup.com
* https://qpostapp.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://gnu.org/licenses/>
*/
.ant-modal-content {
.ant-modal-body {
.changelogModalBody {
h1, h2, h3, h4, h5, h6 {
$color: lighten(#001529, 45%) !important;
color: $color;
font-size: 16px;
font-weight: bold;
padding-bottom: 5px;
border-bottom: 1px solid $color;
text-transform: uppercase;
}
ul {
list-style-type: square;
padding-left: 20px;
margin-bottom: 0;
}
}
}
}
\ No newline at end of file
......@@ -106,10 +106,10 @@
}
.feedEntryButtonHolder {
padding: 15px 0;
padding-bottom: 5px;
&.reduceMargin {
padding: 5px 0 !important;
padding-bottom: 5px !important;
}
//background-color: rgb(241, 241, 241);
......
......@@ -34,4 +34,14 @@
background-color: darken($warning, 10%);
}
}
}
.homeFeedProfileBoxEditButton {
max-width: 94px;
&, span {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
}
\ No newline at end of file
......@@ -28,7 +28,7 @@
li {
@extend .small, .mr-2;
display: inline;
display: inline-block;
}
}
}
\ No newline at end of file
......@@ -22,7 +22,11 @@ $colors: (
"twitch": #9146FF,
"twitter": #1DA1F2,
"mastodon": #2B90D9,
"lastfm": #D51007
"lastfm": #D51007,
"spotify": #1DB954,
"instagram": #C13584,
"reddit": #FF4500,
"youtube": #F00
);
@each $name, $color in $colors {
......
......@@ -140,6 +140,8 @@
@mixin desktopHeaderUserStyle($bgColor) {
.desktopHeaderUser, .desktopHeaderSettings {
height: 63px !important;
&, &:hover, &:active, &:focus {
background-color: $bgColor !important;
top: 0 !important;
......@@ -149,7 +151,70 @@
.desktopHeaderUser, .desktopHeaderSettings {
padding: 0 15px !important;
}
.desktopHeaderAccountDropdown {
$width: 80px;
position: absolute;
width: calc(200px + #{$width});
margin-left: calc(-86px - #{$width});
background-color: $bgColor;
margin-top: -1px;
padding: 15px;
cursor: default;
right: 0;
&, a, a:hover, a:visited, a:focus, a:active {
color: #FFF;
text-decoration: none !important;
}
a {
display: block;
line-height: 30px;
i, svg {
color: darken(#FFF, 30%);
}
}
.profileInfo {
@include clearfix();
line-height: 23px;
$avatarSize: 48px;
$avatarMargin: 10px;
.profileInfoLeft {
float: left;
margin-right: $avatarMargin;
img {
@extend .rounded;
height: $avatarSize;
width: $avatarSize;
}
}
.profileInfoRight {
float: left;
max-width: calc(100% - #{$avatarSize} - #{$avatarMargin});
.profileInfoDisplayName {
font-size: 18px;
font-weight: bold;
}
.profileInfoUserName {
color: darken(#FFF, 30%);
}
.profileInfoDisplayName, .profileInfoUserName {
@include cutText();
}
}
}
}
}
@include desktopHeaderUserStyle(darken($primary, 10%));
......@@ -19,19 +19,18 @@
.profile {
.profileHeader {
@extend .rounded;
@extend .rounded-top;
background-size: cover;
background-repeat: no-repeat;
background-position: center center;
height: 20vw;
height: 10vw;
min-height: 150px;
margin-bottom: 10px;
}
.mobilePart {
@media only screen and (min-width: 1091px) {
/*@media only screen and (min-width: 1091px) {
display: none !important;
}
}*/
.ant-card-body {
@extend .px-3;
......
......@@ -22,14 +22,14 @@ $grid-breakpoints: (
sm: 676px,
md: 868px,
lg: 1092px,
xl: 1500px
xl: 1370px
);
$container-max-widths: (
sm: 620px,
md: 820px,
lg: 1060px,
xl: 1440px
xl: 1270px
);
$white: #fff !default;
......
......@@ -21,9 +21,11 @@
@import "~bootstrap/scss/bootstrap";
@import "util/index";
@import "account-switcher";
@import "alerts";
@import "base";
@import "buttons";
@import "changelog";
@import "download";
@import "emoji";
@import "feed";
......
/*!
* Copyright (C) 2018-2020 Gigadrive - All rights reserved.
* https://gigadrivegroup.com
* https://qpostapp.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://gnu.org/licenses/>
*/
.accountSwitcher {
.account {
$bg: lighten(#001529, 2%);
$border: lighten($bg, 20%);
@include darkButton();
&:hover {
}
&.active {
border-color: $border !important;
}
&.logout {
$bg: #380002;
$border: #230002;
background-color: $bg !important;
border-color: $border !important;
&:hover {
background-color: lighten($bg, 10%) !important;
}
}
.info {
.displayName {
}
.userName {
color: darken(#FFF, 20%);
}
}
}
}
\ No newline at end of file
......@@ -17,18 +17,6 @@
* along with this program. If not, see <https://gnu.org/licenses/>
*/
@mixin darkButton() {
$color: #001949;
color: #f8f9fa !important;
background-color: $color !important;
border-color: darken($color, 5%) !important;
&:hover {
background-color: lighten($color, 5%) !important;
}
}
.ant-btn {
&:not(.ant-btn-default):not(.ant-btn-dashed):not(.ant-btn-danger):not(.ant-btn-primary):not(.ant-btn-link),
&.ant-btn-dashed,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment