diff --git a/frontend/public/default-avatar.png b/frontend/images/default-avatar.png similarity index 100% rename from frontend/public/default-avatar.png rename to frontend/images/default-avatar.png diff --git a/frontend/index.html b/frontend/index.html index 2293408..e34bf0c 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -100,7 +100,7 @@
- Avatar + Avatar

Общий чат

Онлайн

diff --git a/frontend/public/.gitkeep b/frontend/public/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico deleted file mode 100644 index 0519ecb..0000000 --- a/frontend/public/favicon.ico +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/css/lib/fonts/material-symbols.scss b/frontend/src/css/lib/fonts/material-symbols/index.scss similarity index 95% rename from frontend/src/css/lib/fonts/material-symbols.scss rename to frontend/src/css/lib/fonts/material-symbols/index.scss index f42e886..fbc255e 100644 --- a/frontend/src/css/lib/fonts/material-symbols.scss +++ b/frontend/src/css/lib/fonts/material-symbols/index.scss @@ -3,7 +3,7 @@ font-family: 'Material Symbols Outlined'; font-style: normal; font-weight: 400; - src: url(/webfonts/material-symbols.woff2) format('woff2'); + src: url(index.woff2) format('woff2'); } .material-symbols { diff --git a/frontend/public/webfonts/material-symbols.woff2 b/frontend/src/css/lib/fonts/material-symbols/index.woff2 similarity index 100% rename from frontend/public/webfonts/material-symbols.woff2 rename to frontend/src/css/lib/fonts/material-symbols/index.woff2 diff --git a/frontend/public/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2 b/frontend/src/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2 similarity index 100% rename from frontend/public/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2 rename to frontend/src/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2 diff --git a/frontend/public/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2 b/frontend/src/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2 similarity index 100% rename from frontend/public/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2 rename to frontend/src/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2 diff --git a/frontend/public/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2 b/frontend/src/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2 similarity index 100% rename from frontend/public/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2 rename to frontend/src/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2 diff --git a/frontend/public/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2 b/frontend/src/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2 similarity index 100% rename from frontend/public/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2 rename to frontend/src/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2 diff --git a/frontend/public/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2 b/frontend/src/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2 similarity index 100% rename from frontend/public/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2 rename to frontend/src/css/lib/fonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2 diff --git a/frontend/src/css/lib/fonts/montserrat.scss b/frontend/src/css/lib/fonts/montserrat/index.scss similarity index 75% rename from frontend/src/css/lib/fonts/montserrat.scss rename to frontend/src/css/lib/fonts/montserrat/index.scss index eb91f38..9ed709c 100644 --- a/frontend/src/css/lib/fonts/montserrat.scss +++ b/frontend/src/css/lib/fonts/montserrat/index.scss @@ -4,7 +4,7 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } @@ -14,7 +14,7 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } @@ -24,7 +24,7 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; } @@ -34,7 +34,7 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; } @@ -44,7 +44,7 @@ font-style: normal; font-weight: 400; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2) format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @@ -54,7 +54,7 @@ font-style: normal; font-weight: 500; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } @@ -64,7 +64,7 @@ font-style: normal; font-weight: 500; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } @@ -74,7 +74,7 @@ font-style: normal; font-weight: 500; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; } @@ -84,7 +84,7 @@ font-style: normal; font-weight: 500; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; } @@ -94,7 +94,7 @@ font-style: normal; font-weight: 500; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2) format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @@ -104,7 +104,7 @@ font-style: normal; font-weight: 600; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } @@ -114,7 +114,7 @@ font-style: normal; font-weight: 600; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } @@ -124,7 +124,7 @@ font-style: normal; font-weight: 600; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; } @@ -134,7 +134,7 @@ font-style: normal; font-weight: 600; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; } @@ -144,7 +144,7 @@ font-style: normal; font-weight: 600; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2) format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @@ -154,7 +154,7 @@ font-style: normal; font-weight: 700; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0460-052F, U+1C80-1C8A, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } @@ -164,7 +164,7 @@ font-style: normal; font-weight: 700; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } @@ -174,7 +174,7 @@ font-style: normal; font-weight: 700; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; } @@ -184,7 +184,7 @@ font-style: normal; font-weight: 700; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2) format('woff2'); unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7, U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; } @@ -194,6 +194,6 @@ font-style: normal; font-weight: 700; font-display: swap; - src: url(/webfonts/montserrat/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2) format('woff2'); + src: url(JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2) format('woff2'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } \ No newline at end of file diff --git a/frontend/src/css/style.scss b/frontend/src/css/style.scss index b81dadf..fb57a8f 100644 --- a/frontend/src/css/style.scss +++ b/frontend/src/css/style.scss @@ -4,8 +4,8 @@ @use "common/components"; @use "common/colors" as *; -@use "lib/fonts/montserrat"; -@use "lib/fonts/material-symbols"; +@use "lib/fonts/montserrat/index" as *; +@use "lib/fonts/material-symbols/index" as *; * { margin: 0;