Compare commits
No commits in common. "e54b0ada1c26e922979dedeb1e6db1d3294455e5" and "6b5a286ffbd71eb742cd73c32c2d06a8b4668b9c" have entirely different histories.
e54b0ada1c
...
6b5a286ffb
@ -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
@ -766,13 +766,6 @@ chokidar@^3.2.2:
|
|||||||
optionalDependencies:
|
optionalDependencies:
|
||||||
fsevents "~2.3.2"
|
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:
|
chownr@^2.0.0:
|
||||||
version "2.0.0"
|
version "2.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
|
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"
|
process "^0.11.10"
|
||||||
string_decoder "^1.3.0"
|
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:
|
readdirp@~3.4.0:
|
||||||
version "3.4.0"
|
version "3.4.0"
|
||||||
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
|
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada"
|
||||||
|
|||||||
@ -15,6 +15,11 @@ services:
|
|||||||
max-size: "10m"
|
max-size: "10m"
|
||||||
max-file: "3"
|
max-file: "3"
|
||||||
db:
|
db:
|
||||||
|
logging:
|
||||||
|
driver: json-file
|
||||||
|
options:
|
||||||
|
max-size: "10m"
|
||||||
|
max-file: "3"
|
||||||
image: postgres
|
image: postgres
|
||||||
volumes:
|
volumes:
|
||||||
- ./data/db:/var/lib/postgresql/data
|
- ./data/db:/var/lib/postgresql/data
|
||||||
@ -28,20 +33,24 @@ services:
|
|||||||
options:
|
options:
|
||||||
max-size: "10m"
|
max-size: "10m"
|
||||||
max-file: "3"
|
max-file: "3"
|
||||||
|
|
||||||
backend:
|
backend:
|
||||||
build: ../backend
|
image: backend
|
||||||
volumes:
|
volumes:
|
||||||
- ./wait-for-it.sh:/usr/src/app/wait-for-it.sh
|
- ./wait-for-it.sh:/usr/src/app/wait-for-it.sh
|
||||||
- ./start-backend.sh:/usr/src/app/start-backend.sh
|
- ./start-backend.sh:/usr/src/app/start-backend.sh
|
||||||
|
build: ../backend
|
||||||
environment:
|
environment:
|
||||||
- DB_HOST=db
|
- DB_HOST=db
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
logging:
|
logging:
|
||||||
driver: json-file
|
driver: json-file
|
||||||
options:
|
options:
|
||||||
max-size: "10m"
|
max-size: "10m"
|
||||||
max-file: "3"
|
max-file: "3"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- "db"
|
||||||
command: ["bash", "./wait-for-it.sh", "db:5432", "--timeout=0", "--strict", "--", "bash", "./start-
|
|
||||||
|
command: ["bash", "./wait-for-it.sh", "db:5432", "--timeout=0", "--strict", "--", "bash", "./start-backend.sh"]
|
||||||
|
|
||||||
|
|||||||
0
docker/start-backend.sh
Executable file → Normal file
0
docker/start-backend.sh
Executable file → Normal file
0
docker/wait-for-it.sh
Executable file → Normal file
0
docker/wait-for-it.sh
Executable file → Normal file
@ -31,31 +31,31 @@ interface StyleState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const initialState: StyleState = {
|
const initialState: StyleState = {
|
||||||
asideStyle: styles.white.aside,
|
asideStyle: styles.pastelEmeraldTheme.aside,
|
||||||
asideScrollbarsStyle: styles.white.asideScrollbars,
|
asideScrollbarsStyle: styles.white.asideScrollbars,
|
||||||
asideBrandStyle: styles.white.asideBrand,
|
asideBrandStyle: styles.white.asideBrand,
|
||||||
asideMenuItemStyle: styles.white.asideMenuItem,
|
asideMenuItemStyle: styles.pastelEmeraldTheme.asideMenuItem,
|
||||||
asideMenuItemActiveStyle: styles.white.asideMenuItemActive,
|
asideMenuItemActiveStyle: styles.pastelEmeraldTheme.asideMenuItemActive,
|
||||||
activeLinkColor: styles.white.activeLinkColor,
|
activeLinkColor: styles.pastelEmeraldTheme.activeLinkColor,
|
||||||
asideMenuDropdownStyle: styles.white.asideMenuDropdown,
|
asideMenuDropdownStyle: styles.white.asideMenuDropdown,
|
||||||
navBarItemLabelStyle: styles.white.navBarItemLabel,
|
navBarItemLabelStyle: styles.pastelEmeraldTheme.navBarItemLabel,
|
||||||
navBarItemLabelHoverStyle: styles.white.navBarItemLabelHover,
|
navBarItemLabelHoverStyle: styles.pastelEmeraldTheme.navBarItemLabelHover,
|
||||||
navBarItemLabelActiveColorStyle:
|
navBarItemLabelActiveColorStyle:
|
||||||
styles.white.navBarItemLabelActiveColor,
|
styles.pastelEmeraldTheme.navBarItemLabelActiveColor,
|
||||||
overlayStyle: styles.white.overlay,
|
overlayStyle: styles.pastelEmeraldTheme.overlay,
|
||||||
darkMode: false,
|
darkMode: false,
|
||||||
bgLayoutColor: styles.white.bgLayoutColor,
|
bgLayoutColor: styles.pastelEmeraldTheme.bgLayoutColor,
|
||||||
iconsColor: styles.white.iconsColor,
|
iconsColor: styles.pastelEmeraldTheme.iconsColor,
|
||||||
cardsColor: styles.white.cardsColor,
|
cardsColor: styles.pastelEmeraldTheme.cardsColor,
|
||||||
focusRingColor: styles.white.focusRingColor,
|
focusRingColor: styles.pastelEmeraldTheme.focusRingColor,
|
||||||
corners: styles.white.corners,
|
corners: styles.pastelEmeraldTheme.corners,
|
||||||
cardsStyle: styles.white.cardsStyle,
|
cardsStyle: styles.pastelEmeraldTheme.cardsStyle,
|
||||||
linkColor: styles.white.linkColor,
|
linkColor: styles.pastelEmeraldTheme.linkColor,
|
||||||
websiteHeder: styles.white.websiteHeder,
|
websiteHeder: styles.pastelEmeraldTheme.websiteHeder,
|
||||||
borders: styles.white.borders,
|
borders: styles.pastelEmeraldTheme.borders,
|
||||||
shadow: styles.white.shadow,
|
shadow: styles.pastelEmeraldTheme.shadow,
|
||||||
websiteSectionStyle: styles.white.websiteSectionStyle,
|
websiteSectionStyle: styles.pastelEmeraldTheme.websiteSectionStyle,
|
||||||
textSecondary: styles.white.textSecondary,
|
textSecondary: styles.pastelEmeraldTheme.textSecondary,
|
||||||
};
|
};
|
||||||
|
|
||||||
export const styleSlice = createSlice({
|
export const styleSlice = createSlice({
|
||||||
|
|||||||
12
package-lock.json
generated
12
package-lock.json
generated
@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "app",
|
|
||||||
"version": "0.0.0",
|
|
||||||
"lockfileVersion": 2,
|
|
||||||
"requires": true,
|
|
||||||
"packages": {
|
|
||||||
"": {
|
|
||||||
"name": "app",
|
|
||||||
"version": "0.0.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user