From 348fdf123dc9cc706f5ad7c9bbc2f64c8040bdc4 Mon Sep 17 00:00:00 2001 From: Nick Kosarev Date: Wed, 21 Aug 2024 11:15:27 +0000 Subject: [PATCH 1/2] fix: removed old scripts --- package.json | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 3a75d627..41a12d2b 100644 --- a/package.json +++ b/package.json @@ -18,16 +18,14 @@ "twitch" ], "scripts": { - "dev": "vite dev", - "build": "svelte-kit sync && vite build", - "preview": "vite preview", - "check": "svelte-kit sync && svelte-check --tsconfig tsconfig.json", - "check:watch": "svelte-kit sync && svelte-check --tsconfig tsconfig.json --watch", - "test": "vitest run --coverage", - "lint": "eslint", - "lint:fix": "eslint --fix", + "start": "nx run-many -t serve", + "test": "nx affected:test", + "lint": "nx affected:lint", "release": "yarn run check && yarn run test && yarn run lint && yarn run build && changelogen --release --push", - "prepare": "husky" + "prepare": "husky", + "update": "nx migrate latest", + "dep-graph": "nx dep-graph", + "help": "nx help" }, "dependencies": { "@hmbanan666/chat-game-api": "^0.1.18", @@ -106,6 +104,5 @@ }, "lint-staged": { "*.ts": "yarn run lint" - }, - "nx": {} + } } From 5771579a3da3cbb7b527d73c33b3a79351b4d861 Mon Sep 17 00:00:00 2001 From: Nick Kosarev Date: Wed, 21 Aug 2024 13:56:40 +0000 Subject: [PATCH 2/2] chore: env tests --- .devcontainer/devcontainer.json | 1 - .env.example | 4 +- README.md | 2 +- apps/website/nuxt.config.ts | 13 ++-- .../src/assets/img/icons/twitch/112.png | Bin 0 -> 433 bytes .../src/assets/img/icons/twitch/28.png | Bin 0 -> 230 bytes .../src/assets/img/icons/twitch/56.png | Bin 0 -> 292 bytes .../{MainHeader.vue => MainHeader.client.vue} | 0 apps/website/src/components/MenuDesktop.vue | 18 ++--- apps/website/src/components/MenuProfile.vue | 63 ++++++++++++++++++ .../website/src/components/MenuSmartphone.vue | 13 ++-- apps/website/src/server/plugins/start.ts | 2 +- 12 files changed, 86 insertions(+), 30 deletions(-) create mode 100644 apps/website/src/assets/img/icons/twitch/112.png create mode 100644 apps/website/src/assets/img/icons/twitch/28.png create mode 100644 apps/website/src/assets/img/icons/twitch/56.png rename apps/website/src/components/{MainHeader.vue => MainHeader.client.vue} (100%) create mode 100644 apps/website/src/components/MenuProfile.vue 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 0000000000000000000000000000000000000000..bb5e2a75cbb6b35019b8f6e61c3af964069c91d6 GIT binary patch literal 433 zcmeAS@N?(olHy`uVBq!ia0vp^1t8491|*L?_~H$u7>k44ofy`glX(ebXM4IhhE&XX zdv~Mn;Q$ebiw!GoG&DvimRz`aNMp&;=Dsxt9C94ErEeU4uD$Q!9J7o5OIC;5SZ*x0 z1{wqe4`O0_(}{QGV|^XdJ+l;*TG6fzy-lu%EY17gJX%5B*8 z+;;C>TL_Y zeciD({(W>Z6Vwc-eBS5k2iMO2`+r|b7-l`x9p4U!W>??)dcE#r-TeOfhqtH1rl9Ms z@T}bV-{SRiryjfOiDu{qsNXM4v#f literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..297f5946ebb5dc6d94c777e90eb8ceb91881f307 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zjKx9jP7LeL$-D$|7I?ZihIn)) zCrGe5%Ni`=K2!Af`~e{N;9GRHJ}V+%gNDpeKD8_fFRlbf@rIu|^@$R$Z2mp*t)X+? z*{R$*)cJAshFwzAEslx>ar4x38wP3WHE3U*G;0?7dj3wLQ+CP z;!;_%$YmZL9_9zmJn23i(Vk(tjd9u!n3&%?mo%)dQxOT@ao~af(kH)o*j~Il9BA-` akzod(hKki%y#QX={@f2c={#RXJNJ?a z1H+&7Gs6lZzn}b^ef6unmwMrz+?u2)T5DR5zTYnVd%yMo-)d(SdFk4<02f8UX* zYWcYZQ|Acgrmg)N_R!kH;XTI-S;oDm_wh%4-+1Z%Hn7m9^9gy^{@ZKTuyek+d;aW# zIXj7nZ->`zp4j?0SMINFeV^)%JVxeRr>~IaEHO;hyM! mv9-3vK|lC}1Q-~8d}TY&s{SlC;GZMVrwpF1elF{r5}E+I`GI2q literal 0 HcmV?d00001 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 @@ - - 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 @@