diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 759ae666..b95394b6 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -20,7 +20,6 @@
"extensions": [
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
- "svelte.svelte-vscode",
"Vue.volar",
"nrwl.angular-console",
"ms-playwright.playwright",
diff --git a/.env.example b/.env.example
index a8d41a44..22775bd8 100644
--- a/.env.example
+++ b/.env.example
@@ -1,8 +1,8 @@
# Go to your Twitch developer console and create a new application
-PUBLIC_TWITCH_CLIENT_ID=""
+NUXT_PUBLIC_TWITCH_CLIENT_ID=""
# Will redirect to with #access_token
-PUBLIC_SIGNIN_REDIRECT_URL=""
+NUXT_PUBLIC_SIGNIN_REDIRECT_URL=""
# Where will be all session data
PUBLIC_COOKIE_KEY=""
diff --git a/README.md b/README.md
index 0bb69cb5..309e619d 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ Make a fork. Or clone this repo and use standard commands:
```shell
git clone https://github.com/chat-game/space
yarn install
-yarn run dev
+yarn run start
```
## 🏆 Contributors
diff --git a/apps/website/nuxt.config.ts b/apps/website/nuxt.config.ts
index 7237bed1..6804dfa5 100644
--- a/apps/website/nuxt.config.ts
+++ b/apps/website/nuxt.config.ts
@@ -6,34 +6,33 @@ export default defineNuxtConfig({
workspaceDir: '../../',
srcDir: 'src',
devtools: { enabled: true },
-
devServer: {
host: '0.0.0.0',
port: 4200,
},
-
typescript: {
typeCheck: true,
tsConfig: {
extends: '../tsconfig.app.json', // Nuxt copies this string as-is to the `./.nuxt/tsconfig.json`, therefore it needs to be relative to that directory
},
},
-
imports: {
autoImport: true,
},
-
css: ['~/assets/css/styles.css'],
-
vite: {
plugins: [nxViteTsPaths()],
},
-
+ runtimeConfig: {
+ public: {
+ twitchClientId: '', // NUXT_PUBLIC_TWITCH_CLIENT_ID
+ signInRedirectUrl: '', // NUXT_PUBLIC_SIGNIN_REDIRECT_URL
+ },
+ },
modules: [
'@nuxt/eslint',
'@vueuse/nuxt',
'@pinia/nuxt',
],
-
compatibilityDate: '2024-08-18',
});
\ No newline at end of file
diff --git a/apps/website/src/assets/img/icons/twitch/112.png b/apps/website/src/assets/img/icons/twitch/112.png
new file mode 100644
index 00000000..bb5e2a75
Binary files /dev/null and b/apps/website/src/assets/img/icons/twitch/112.png differ
diff --git a/apps/website/src/assets/img/icons/twitch/28.png b/apps/website/src/assets/img/icons/twitch/28.png
new file mode 100644
index 00000000..297f5946
Binary files /dev/null and b/apps/website/src/assets/img/icons/twitch/28.png differ
diff --git a/apps/website/src/assets/img/icons/twitch/56.png b/apps/website/src/assets/img/icons/twitch/56.png
new file mode 100644
index 00000000..114d61bd
Binary files /dev/null and b/apps/website/src/assets/img/icons/twitch/56.png differ
diff --git a/apps/website/src/components/MainHeader.vue b/apps/website/src/components/MainHeader.client.vue
similarity index 100%
rename from apps/website/src/components/MainHeader.vue
rename to apps/website/src/components/MainHeader.client.vue
diff --git a/apps/website/src/components/MenuDesktop.vue b/apps/website/src/components/MenuDesktop.vue
index 1c955efc..70764d76 100644
--- a/apps/website/src/components/MenuDesktop.vue
+++ b/apps/website/src/components/MenuDesktop.vue
@@ -1,36 +1,32 @@
-
-
-
+
Главная
-
+
About
-
+
Персонажи
-
+
Задания
-
+
Трофеи
-
+
Купон
@@ -46,7 +42,7 @@ const route = useRoute()
diff --git a/apps/website/src/components/MenuProfile.vue b/apps/website/src/components/MenuProfile.vue
new file mode 100644
index 00000000..481528ab
--- /dev/null
+++ b/apps/website/src/components/MenuProfile.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/apps/website/src/components/MenuSmartphone.vue b/apps/website/src/components/MenuSmartphone.vue
index abf8e39a..304cf7cb 100644
--- a/apps/website/src/components/MenuSmartphone.vue
+++ b/apps/website/src/components/MenuSmartphone.vue
@@ -1,5 +1,4 @@