Skip to content

Commit ab8711b

Browse files
krabiworldkrabiworld
committed
Merge branch 'dev'
2 parents 60453b2 + 266c6b2 commit ab8711b

26 files changed

+254
-204
lines changed

‎.dockerignore

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
# Nuxt dev/build outputs
2-
.output
3-
.data
4-
.nuxt
5-
.nitro
6-
.cache
1+
# Preact dev/build outputs
72
dist
83

94
# Node dependencies
@@ -12,3 +7,17 @@ node_modules
127
# Docker
138
Dockerfile
149
.dockerignore
10+
docker-compose-*.yml
11+
12+
# Tauri
13+
src-tauri
14+
15+
# Editors
16+
.idea
17+
.vscode
18+
19+
# Git
20+
.github
21+
.gitignore
22+
README.md
23+
LICENSE

‎.gitignore

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,18 @@ dist-ssr
1717
!.vscode/extensions.json
1818
.idea
1919
!.idea/codeStyles
20-
.DS_Store
2120
*.suo
2221
*.ntvs*
2322
*.njsproj
2423
*.sln
2524
*.sw?
2625

27-
package-lock.json
26+
# Tauri
27+
src-tauri/target/
28+
src-tauri/gen/schemas
29+
30+
# macOS
31+
.DS_Store
32+
33+
# Lock file
34+
package-lock.json

‎Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM node:latest AS builder
22

3+
ARG NODE_ENV
4+
35
WORKDIR /workspace
46

57
# Copy package manifest.

‎docker-compose-dev.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
services:
22
foxogram-frontend-dev:
3+
container_name: foxogram-frontend-dev
34
build:
45
context: .
6+
args:
7+
NODE_ENV: development
58
restart: always
69
networks:
710
- traefik

‎docker-compose-prod.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
services:
22
foxogram-frontend:
3+
container_name: foxogram-frontend
34
build:
45
context: .
6+
args:
7+
NODE_ENV: production
58
restart: always
69
networks:
710
- traefik

‎index.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/foxogram-favicon.svg" />
65
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
76
<meta name="color-scheme" content="light dark" />
87
<title>Foxogram</title>
8+
<link rel="icon" type="image/png" href="/favicon-96x96.png" sizes="96x96" />
9+
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
10+
<link rel="shortcut icon" href="/favicon.ico" />
11+
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
12+
<meta name="apple-mobile-web-app-title" content="Foxogram" />
13+
<link rel="manifest" href="/site.webmanifest" />
914
</head>
1015
<body>
1116
<div id="app"></div>

‎package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,30 @@
55
"dev": "vite",
66
"build": "vite build",
77
"preview": "vite preview",
8-
"lint": "eslint .",
98
"tauri": "tauri",
109
"dev-desktop": "tauri dev",
1110
"build-desktop": "tauri build"
1211
},
1312
"dependencies": {
14-
"@fontsource/inter": "^5.1.1",
13+
"@fontsource/inter": "^5.1.0",
1514
"@foxogram/api": "^0.1.2",
1615
"@foxogram/rest": "^0.1.0",
1716
"mobx": "^6.13.5",
18-
"preact": "^10.25.4",
17+
"preact": "^10.22.1",
1918
"preact-iso": "^2.8.1",
2019
"styled-components": "^6.1.13"
2120
},
2221
"devDependencies": {
23-
"@eslint/js": "^9.17.0",
24-
"@preact/preset-vite": "^2.9.3",
22+
"@eslint/js": "^9.16.0",
23+
"@preact/preset-vite": "^2.9.0",
2524
"@tauri-apps/cli": "^2.1.0",
2625
"@tsconfig/strictest": "^2.0.5",
2726
"@tsconfig/vite-react": "^3.4.0",
28-
"eslint": "^9.17.0",
29-
"eslint-plugin-react": "^7.37.3",
30-
"globals": "^15.14.0",
27+
"eslint": "^8.57.1",
28+
"eslint-plugin-react": "^7.37.2",
29+
"globals": "^15.13.0",
3130
"typescript": "^5.7.2",
32-
"typescript-eslint": "^8.19.0",
33-
"vite": "^6.0.6"
31+
"typescript-eslint": "^8.17.0",
32+
"vite": "^5.3.3"
3433
}
35-
}
34+
}

‎public/apple-touch-icon.png

3.69 KB
Loading

‎public/favicon-96x96.png

1.66 KB
Loading

‎public/favicon.ico

14.7 KB
Binary file not shown.

‎public/favicon.svg

Lines changed: 6 additions & 0 deletions
Loading

‎public/foxogram-favicon.svg

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎public/site.webmanifest

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"name": "Foxogram",
3+
"short_name": "Foxogram",
4+
"icons": [
5+
{
6+
"src": "/web-app-manifest-192x192.png",
7+
"sizes": "192x192",
8+
"type": "image/png",
9+
"purpose": "maskable"
10+
},
11+
{
12+
"src": "/web-app-manifest-512x512.png",
13+
"sizes": "512x512",
14+
"type": "image/png",
15+
"purpose": "maskable"
16+
}
17+
],
18+
"theme_color": "#ffffff",
19+
"background_color": "#ffffff",
20+
"display": "standalone"
21+
}

‎public/web-app-manifest-192x192.png

4.06 KB
Loading

‎public/web-app-manifest-512x512.png

15.1 KB
Loading

‎src-tauri/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src-tauri/tauri.conf.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
"windows": [
1414
{
1515
"title": "Foxogram",
16-
"width": 800,
17-
"height": 600,
16+
"width": 1100,
17+
"height": 650,
18+
"minWidth": 1100,
19+
"minHeight": 650,
1820
"resizable": true,
1921
"fullscreen": false
2022
}

‎src/components/base/buttons/Buttons.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
}
3838

3939
.button-secondary {
40-
border: 1px solid rgba(96, 96, 96, 0.5);
40+
border: 1px solid rgb(96 96 96 / 0.5);
4141
font-weight: 500;
4242
font-size: 15px;
43-
background: rgba(14, 14, 14, 0.25);
43+
background: rgb(14 14 14 / 0.25);
4444
}
4545

4646
.button-danger {

‎src/components/modal/EmailConfirmationModal.module.css

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
align-items: center;
1010
z-index: 1000;
1111
backdrop-filter: blur(15px);
12-
background: rgba(0, 0, 0, 0.02);
12+
background: rgb(0 0 0 / 0.02);
1313
opacity: 0;
1414
pointer-events: none;
1515
transition: opacity 0.3s ease;
@@ -21,8 +21,8 @@
2121
}
2222

2323
.modal {
24-
background: rgba(8, 8, 8, 0.8);
25-
border: 1.5px solid rgba(96, 96, 96, 0.5);
24+
background: rgb(8 8 8 / 0.8);
25+
border: 1.5px solid rgb(96 96 96 / 0.5);
2626
backdrop-filter: blur(40px);
2727
border-radius: 5px;
2828
padding: 20px 37px;
@@ -52,7 +52,7 @@
5252
.description {
5353
font-weight: 200;
5454
font-size: 16px;
55-
color: rgba(236, 236, 236, 0.5);
55+
color: rgb(236 236 236 / 0.5);
5656
margin-bottom: 16px;
5757
}
5858

@@ -69,9 +69,9 @@
6969
font-size: 26px ;
7070
font-weight: 400 ;
7171
text-align: center ;
72-
border: 1px solid rgba(96, 96, 96, 0.5) ;
72+
border: 1px solid rgb(96 96 96 / 0.5) ;
7373
backdrop-filter: blur(25px) ;
74-
background: rgba(8, 8, 8, 0.25) ;
74+
background: rgb(8 8 8 / 0.25) ;
7575
border-radius: 5px ;
7676
margin: 0 5px ;
7777
transition: border-color 0.3s ease ;
@@ -86,7 +86,7 @@
8686
.input-with-placeholder::placeholder {
8787
font-size: 24px !important;
8888
font-weight: 300;
89-
color: rgba(96, 96, 96, 0.7);
89+
color: rgb(96 96 96 / 0.7);
9090
}
9191

9292
.actions {
@@ -102,7 +102,7 @@
102102
}
103103

104104
.resend-link:hover {
105-
color: rgba(74, 137, 255, 0.8);
105+
color: rgb(74 137 255 / 0.8);
106106
}
107107

108108
.resend-text {
@@ -143,6 +143,6 @@
143143
.line::after {
144144
content: '';
145145
flex: 1;
146-
border-bottom: 1px solid rgba(165, 63, 63, 0.5);
146+
border-bottom: 1px solid rgb(165 63 63 / 0.5);
147147
margin: 0 10px;
148148
}

‎src/components/modal/Modal.module.css

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
align-items: center;
1010
z-index: 1000;
1111
backdrop-filter: blur(15px);
12-
background: rgba(0, 0, 0, 0.02);
12+
background: rgb(0 0 0 / 0.02);
1313
opacity: 0;
1414
pointer-events: none;
1515
transition: opacity 0.3s ease;
@@ -21,16 +21,15 @@
2121
}
2222

2323
.modal {
24-
background: rgba(8, 8, 8, 0.8);
25-
border: 1.5px solid rgba(96, 96, 96, 0.5);
24+
background: rgb(8 8 8 / 0.8);
25+
border: 1.5px solid rgb(96 96 96 / 0.5);
2626
backdrop-filter: blur(40px);
2727
border-radius: 5px;
2828
padding: 30px 35px;
2929
max-width: 320px;
3030
animation: fadeIn 0.3s ease;
3131
}
3232

33-
3433
@keyframes fadeIn {
3534
from {
3635
opacity: 0;
@@ -53,7 +52,7 @@
5352
.description {
5453
font-weight: 100;
5554
font-size: 15px;
56-
color: rgba(236, 236, 236, 0.5);
55+
color: rgb(236 236 236 / 0.5);
5756
text-align: left;
5857
margin-bottom: 30px;
5958
white-space: pre-wrap;

‎src/components/modal/PasswordResetModal.module.css

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
align-items: center;
1010
z-index: 1000;
1111
backdrop-filter: blur(15px);
12-
background: rgba(0, 0, 0, 0.02);
12+
background: rgb(0 0 0 / 0.02);
1313
opacity: 0;
1414
pointer-events: none;
1515
transition: opacity 0.3s ease;
@@ -21,8 +21,8 @@
2121
}
2222

2323
.modal {
24-
background: rgba(8, 8, 8, 0.8);
25-
border: 1.5px solid rgba(96, 96, 96, 0.5);
24+
background: rgb(8 8 8 / 0.8);
25+
border: 1.5px solid rgb(96 96 96 / 0.5);
2626
backdrop-filter: blur(40px);
2727
border-radius: 5px;
2828
padding: 20px 37px;
@@ -51,7 +51,7 @@
5151
.description {
5252
font-weight: 200;
5353
font-size: 16px;
54-
color: rgba(236, 236, 236, 0.5);
54+
color: rgb(236 236 236 / 0.5);
5555
margin-bottom: 16px;
5656
}
5757

@@ -71,9 +71,9 @@
7171
text-align: left;
7272
padding-left: 10px;
7373
padding-bottom: 3px;
74-
border: 1px solid rgba(96, 96, 96, 0.5);
74+
border: 1px solid rgb(96 96 96 / 0.5);
7575
backdrop-filter: blur(25px);
76-
background: rgba(8, 8, 8, 0.25);
76+
background: rgb(8 8 8 / 0.25);
7777
border-radius: 5px;
7878
transition: border-color 0.3s ease;
7979
caret-color: transparent;
@@ -86,9 +86,9 @@
8686
font-size: 26px;
8787
font-weight: 400;
8888
text-align: center;
89-
border: 1px solid rgba(96, 96, 96, 0.5);
89+
border: 1px solid rgb(96 96 96 / 0.5);
9090
backdrop-filter: blur(25px);
91-
background: rgba(8, 8, 8, 0.25);
91+
background: rgb(8 8 8 / 0.25);
9292
border-radius: 5px;
9393
margin: 0 5px;
9494
transition: border-color 0.3s ease;
@@ -103,7 +103,7 @@
103103
.input-with-placeholder::placeholder {
104104
font-size: 24px !important;
105105
font-weight: 300;
106-
color: rgba(96, 96, 96, 0.7);
106+
color: rgb(96 96 96 / 0.7);
107107
}
108108

109109
.actions {
@@ -119,7 +119,7 @@
119119
}
120120

121121
.resend-link:hover {
122-
color: rgba(74, 137, 255, 0.8);
122+
color: rgb(74 137 255 / 0.8);
123123
}
124124

125125
.resend-text {
@@ -160,6 +160,6 @@
160160
.line::after {
161161
content: '';
162162
flex: 1;
163-
border-bottom: 1px solid rgba(165, 63, 63, 0.5);
163+
border-bottom: 1px solid rgb(165 63 63 / 0.5);
164164
margin: 0 10px;
165165
}

0 commit comments

Comments
 (0)