diff --git a/.editorconfig b/.editorconfig index 1aa37fe..15b3f2a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,6 +8,6 @@ insert_final_newline = true indent_style = tab indent_size = tab -[{*.yaml,*.yml}] +[{*.yaml,*.yml,*.nix}] indent_style = space indent_size = 2 diff --git a/back/src/auth/auth.service.ts b/back/src/auth/auth.service.ts index 4c2d98f..121b87a 100644 --- a/back/src/auth/auth.service.ts +++ b/back/src/auth/auth.service.ts @@ -37,6 +37,7 @@ export class AuthService { async sendVerifyMail(user: User) { if (process.env.IGNORE_MAILS === "true") return; + console.log("Sending verification mail to", user.email); const token = await this.jwtService.signAsync( { userId: user.id, diff --git a/front/.dockerignore b/front/.dockerignore index d1265c1..dfcd4d7 100644 --- a/front/.dockerignore +++ b/front/.dockerignore @@ -1,4 +1,7 @@ node_modules/ .expo/ .idea/ -.vscode/ \ No newline at end of file +.vscode/ +.dockerignore +Dockerfile +Dockerfile.dev diff --git a/front/Dockerfile b/front/Dockerfile index c219a27..6195c23 100644 --- a/front/Dockerfile +++ b/front/Dockerfile @@ -24,5 +24,3 @@ FROM nginx:1.21-alpine COPY --from=build /app/web-build /usr/share/nginx/html COPY ./assets/ /usr/share/nginx/html/assets/ COPY nginx.conf.template /etc/nginx/templates/default.conf.template - -CMD nginx -g 'daemon off;' diff --git a/front/components/Metronome.tsx b/front/components/Metronome.tsx index 320770a..7751f0e 100644 --- a/front/components/Metronome.tsx +++ b/front/components/Metronome.tsx @@ -9,7 +9,6 @@ export const Metronome = ({ paused = false, bpm }: { paused?: boolean; bpm: numb useEffect(() => { if (paused) return; const int = setInterval(() => { - console.log(enabled.current, volume.current); if (!enabled.current) return; if (!ref.current) ref.current = new Audio('/assets/metronome.mp3'); ref.current.volume = volume.current / 100; diff --git a/front/nginx.conf.template b/front/nginx.conf.template index fc5af83..9baf3ed 100644 --- a/front/nginx.conf.template +++ b/front/nginx.conf.template @@ -4,10 +4,6 @@ server { index index.html; - location /assets { - alias ./assets; - } - location / { try_files $uri $uri/ /index.html; } diff --git a/front/views/settings/SettingsProfileView.tsx b/front/views/settings/SettingsProfileView.tsx index fdf16d5..25d4462 100644 --- a/front/views/settings/SettingsProfileView.tsx +++ b/front/views/settings/SettingsProfileView.tsx @@ -62,7 +62,19 @@ const ProfileSettings = ({ navigation }: { navigation: any }) => { text: user.emailVerified ? 'verified' : 'not verified', onPress: user.emailVerified ? undefined - : () => API.fetch({ route: '/auth/reverify', method: 'PUT' }), + : () => + API.fetch({ route: '/auth/reverify', method: 'PUT' }) + .then(() => + Toast.show({ + description: 'Verification mail sent', + }) + ) + .catch((e) => { + console.error(e); + Toast.show({ + description: 'Verification mail send error', + }); + }), }, }, { diff --git a/shell.nix b/shell.nix index edc76e1..6aa53b8 100644 --- a/shell.nix +++ b/shell.nix @@ -5,9 +5,10 @@ pkgs.mkShell { nodePackages.prisma nodePackages."@nestjs/cli" nodePackages.npm + eslint_d nodejs_16 yarn - python3 + (python3.withPackages (ps: with ps; [requests])) pkg-config ]; shellHook = with pkgs; ''