Merge branch 'master' into feature/maps-management

This commit is contained in:
MathieuG-P
2022-11-19 15:18:51 +01:00
15 changed files with 3136 additions and 2262 deletions
+6 -10
View File
@@ -76,14 +76,6 @@ const configuration: webpack.Configuration = {
},
},
'sass-loader',
{
loader: 'postcss-loader',
options: {
postcssOptions: {
plugins: [require('tailwindcss'), require('autoprefixer')],
},
},
},
],
include: /\.module\.s?(c|a)ss$/,
},
@@ -96,8 +88,12 @@ const configuration: webpack.Configuration = {
{
loader: 'postcss-loader',
options: {
postcssOptions: {
plugins: [require('tailwindcss'), require('autoprefixer')],
postcssOptions: {
plugins:
[
require('tailwindcss'),
require('autoprefixer'),
]
},
},
},
+6 -10
View File
@@ -58,14 +58,6 @@ const configuration: webpack.Configuration = {
},
},
'sass-loader',
{
loader: 'postcss-loader',
options: {
postcssOptions: {
plugins: [require('tailwindcss'), require('autoprefixer')],
},
},
},
],
include: /\.module\.s?(c|a)ss$/,
},
@@ -78,8 +70,12 @@ const configuration: webpack.Configuration = {
{
loader: 'postcss-loader',
options: {
postcssOptions: {
plugins: [require('tailwindcss'), require('autoprefixer')],
postcssOptions: {
plugins:
[
require('tailwindcss'),
require('autoprefixer'),
]
},
},
},
+1 -1
View File
@@ -1,7 +1,7 @@
---
name: Bug report
about: Create a report to help us improve
title: "[BUG]"
title: "Bug: "
labels: bug
assignees: Zagrios
+2 -2
View File
@@ -1,8 +1,8 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[AME]"
labels: enhancement
title: "Feature: "
labels: feature
assignees: Zagrios
---
+1
View File
@@ -0,0 +1 @@
registry=https://registry.npmjs.org/
+8
View File
@@ -493,5 +493,13 @@
"ReleaseImg": "https://cdn.cloudflare.steamstatic.com/steamcommunity/public/images/clans//32055887/52cbd15b5e226f509e051565f6e4935eb0e44e2c.png",
"ReleaseDate": "1665673269",
"year": "2022"
},
{
"BSVersion": "1.26.0",
"BSManifest": "3634450655207470002",
"ReleaseURL": "https://steamcommunity.com/games/620980/announcements/detail/3414318646334948892",
"ReleaseImg": "https://cdn.akamai.steamstatic.com/steamcommunity/public/images/clans//32055887/d18ad9d7f45a5cc2a467d75f0bdf9d32b9141b14.png",
"ReleaseDate": "1667923560",
"year": "2022"
}
]
+3098 -2233
View File
File diff suppressed because it is too large Load Diff
+6
View File
@@ -0,0 +1,6 @@
const tailwindcss = require("tailwindcss");
const autoprefixer = require("autoprefixer");
module.exports = {
plugins: [tailwindcss, autoprefixer],
};
Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

+1 -1
View File
@@ -22,7 +22,7 @@ const isDebug = process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD
log.transports.file.level = 'info';
log.transports.file.resolvePath = (() => {
const now = new Date();
return path.join(app.getPath("logs"), `${now.getFullYear()}-${now.getMonth()+1}-${now.getDate()}.log`);
return path.join(app.getPath("logs"), `${now.getFullYear()}-${now.getMonth()+1}-${now.getDate()}-v${app.getVersion()}.log`);
});
log.catchErrors();
+1
View File
@@ -11,6 +11,7 @@ import { ThemeService } from "./services/theme.service";
import { NotificationOverlay } from "./components/notification/notification-overlay.component";
import { PageStateService } from "./services/page-state.service";
import MapsPage from "./pages/maps-page.component";
import "tailwindcss/tailwind.css";
export default function App() {
+4 -1
View File
@@ -30,7 +30,10 @@ export default function Launcher() {
updaterService.isUpdateAvailable().then(available => {
if(!available){ return windowService.openThenCloseAll("index.html"); }
setText("auto-update.downloading");
updaterService.downloadUpdate().then(installed => installed && updaterService.quitAndInstall());
updaterService.downloadUpdate().then(installed => {
if(!installed){ return windowService.openThenCloseAll("index.html"); }
updaterService.quitAndInstall()
});
});
return () => sub.unsubscribe();
@@ -9,7 +9,6 @@ export class ConfigurationService {
private constructor(){
this.observers = new Map<string, BehaviorSubject<any>>();
}
private emitChange(key: string){
if(this.observers.has(key)){
const val = this.get(key);
+1
View File
@@ -22,6 +22,7 @@ export class I18nService {
if(!I18nService.instance){ I18nService.instance = new I18nService(); }
return I18nService.instance;
}
private constructor(){
this.configService = ConfigurationService.getInstance();
this.cache = new Map<string, string>();
+1 -3
View File
@@ -1,10 +1,8 @@
const colors = require('tailwindcss/colors');
/** @type {import('tailwindcss').Config} */
module.exports = {
darkMode: 'class',
content: ['./src/renderer/**/*.tsx'],
content: ['./src/renderer/**/*.{js,jsx,ts,tsx,ejs}'],
mode: 'jit',
plugins: [require('tailwind-scrollbar-hide'), require('tailwind-scrollbar')({ nocompatible: true }), require("tailwindcss-scoped-groups")({groups: ["one"]}), require('ps-scrollbar-tailwind')],
theme:{