Compare commits

..

No commits in common. "e54b0ada1c26e922979dedeb1e6db1d3294455e5" and "6b5a286ffbd71eb742cd73c32c2d06a8b4668b9c" have entirely different histories.

9 changed files with 42 additions and 67 deletions

View File

@ -1,5 +0,0 @@
{
"image": "mcr.microsoft.com/devcontainers/universal:2",
"remoteUser": "codespace",
"overrideCommand": false
}

File diff suppressed because one or more lines are too long

View File

@ -766,13 +766,6 @@ chokidar@^3.2.2:
optionalDependencies:
fsevents "~2.3.2"
chokidar@^4.0.3:
version "4.0.3"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30"
integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==
dependencies:
readdirp "^4.0.1"
chownr@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
@ -3402,11 +3395,6 @@ readable-stream@^4.2.0:
process "^0.11.10"
string_decoder "^1.3.0"
readdirp@^4.0.1:
version "4.1.2"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.1.2.tgz#eb85801435fbf2a7ee58f19e0921b068fc69948d"
integrity sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==
readdirp@~3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"

View File

@ -15,6 +15,11 @@ services:
max-size: "10m"
max-file: "3"
db:
logging:
driver: json-file
options:
max-size: "10m"
max-file: "3"
image: postgres
volumes:
- ./data/db:/var/lib/postgresql/data
@ -28,20 +33,24 @@ services:
options:
max-size: "10m"
max-file: "3"
backend:
build: ../backend
image: backend
volumes:
- ./wait-for-it.sh:/usr/src/app/wait-for-it.sh
- ./start-backend.sh:/usr/src/app/start-backend.sh
- ./wait-for-it.sh:/usr/src/app/wait-for-it.sh
- ./start-backend.sh:/usr/src/app/start-backend.sh
build: ../backend
environment:
- DB_HOST=db
- DB_HOST=db
ports:
- "8080:8080"
logging:
driver: json-file
options:
max-size: "10m"
max-file: "3"
- "8080:8080"
logging:
driver: json-file
options:
max-size: "10m"
max-file: "3"
depends_on:
- db
command: ["bash", "./wait-for-it.sh", "db:5432", "--timeout=0", "--strict", "--", "bash", "./start-
- "db"
command: ["bash", "./wait-for-it.sh", "db:5432", "--timeout=0", "--strict", "--", "bash", "./start-backend.sh"]

0
docker/start-backend.sh Executable file → Normal file
View File

0
docker/wait-for-it.sh Executable file → Normal file
View File

View File

@ -31,31 +31,31 @@ interface StyleState {
}
const initialState: StyleState = {
asideStyle: styles.white.aside,
asideStyle: styles.pastelEmeraldTheme.aside,
asideScrollbarsStyle: styles.white.asideScrollbars,
asideBrandStyle: styles.white.asideBrand,
asideMenuItemStyle: styles.white.asideMenuItem,
asideMenuItemActiveStyle: styles.white.asideMenuItemActive,
activeLinkColor: styles.white.activeLinkColor,
asideMenuItemStyle: styles.pastelEmeraldTheme.asideMenuItem,
asideMenuItemActiveStyle: styles.pastelEmeraldTheme.asideMenuItemActive,
activeLinkColor: styles.pastelEmeraldTheme.activeLinkColor,
asideMenuDropdownStyle: styles.white.asideMenuDropdown,
navBarItemLabelStyle: styles.white.navBarItemLabel,
navBarItemLabelHoverStyle: styles.white.navBarItemLabelHover,
navBarItemLabelStyle: styles.pastelEmeraldTheme.navBarItemLabel,
navBarItemLabelHoverStyle: styles.pastelEmeraldTheme.navBarItemLabelHover,
navBarItemLabelActiveColorStyle:
styles.white.navBarItemLabelActiveColor,
overlayStyle: styles.white.overlay,
styles.pastelEmeraldTheme.navBarItemLabelActiveColor,
overlayStyle: styles.pastelEmeraldTheme.overlay,
darkMode: false,
bgLayoutColor: styles.white.bgLayoutColor,
iconsColor: styles.white.iconsColor,
cardsColor: styles.white.cardsColor,
focusRingColor: styles.white.focusRingColor,
corners: styles.white.corners,
cardsStyle: styles.white.cardsStyle,
linkColor: styles.white.linkColor,
websiteHeder: styles.white.websiteHeder,
borders: styles.white.borders,
shadow: styles.white.shadow,
websiteSectionStyle: styles.white.websiteSectionStyle,
textSecondary: styles.white.textSecondary,
bgLayoutColor: styles.pastelEmeraldTheme.bgLayoutColor,
iconsColor: styles.pastelEmeraldTheme.iconsColor,
cardsColor: styles.pastelEmeraldTheme.cardsColor,
focusRingColor: styles.pastelEmeraldTheme.focusRingColor,
corners: styles.pastelEmeraldTheme.corners,
cardsStyle: styles.pastelEmeraldTheme.cardsStyle,
linkColor: styles.pastelEmeraldTheme.linkColor,
websiteHeder: styles.pastelEmeraldTheme.websiteHeder,
borders: styles.pastelEmeraldTheme.borders,
shadow: styles.pastelEmeraldTheme.shadow,
websiteSectionStyle: styles.pastelEmeraldTheme.websiteSectionStyle,
textSecondary: styles.pastelEmeraldTheme.textSecondary,
};
export const styleSlice = createSlice({

12
package-lock.json generated
View File

@ -1,12 +0,0 @@
{
"name": "app",
"version": "0.0.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "app",
"version": "0.0.0"
}
}
}

View File

@ -1,4 +0,0 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1