Merge branch 'main' into speakers-admin

apps/api/src/app.module.ts

@@ -37,6 +37,10 @@ import { SurveyQuestionModule } from './survey-question/survey-question.module';
           //   rootPath: join(__dirname, '..', '..', '..', 'web', 'dist'),
           //   exclude: ['/api/(.*)', '/sponsor/(.*)', '/admin/(.*)'],
           // }),
+          ServeStaticModule.forRoot({
+            rootPath: join(__dirname, '..', '..', '..', 'web', 'dist'),
+            serveRoot: '/noviweb',
+          }),
           ServeStaticModule.forRoot({
             rootPath: join(__dirname, '..', '..', '..', 'sponsor', 'dist'),
             serveRoot: '/sponsor',

apps/api/src/main.ts

@@ -66,7 +66,8 @@ const setupProxies = (app: INestApplication) => {
         (pathname: string) =>
           !pathname.startsWith('/api') &&
           !pathname.startsWith('/admin') &&
-          !pathname.startsWith('/sponsor'),
+          !pathname.startsWith('/sponsor') &&
+          !pathname.startsWith('/noviweb'),
         {
           target: 'https://ddays.azureedge.net/',
           changeOrigin: true,

apps/web/src/App.scss

@@ -7,6 +7,21 @@
 
 body {
   margin: 0;
+  background-color: #f3eadc;
+}
+
+body::before {
+  content: '';
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 600 600'%3E%3Cfilter id='a'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='.4' numOctaves='3' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23a)'/%3E%3C/svg%3E")
+    lightgray -235.612px -0.288px / 117.634% 193.021% repeat;
+  mix-blend-mode: soft-light;
+  z-index: -1;
+  opacity: 0.5;
 }
 
 @font-face {

apps/web/src/api/event/useEventGetAll.ts

@@ -0,0 +1,12 @@
+import { EventDto } from '@ddays-app/types';
+import { QueryOptions, useQuery } from 'react-query';
+
+import { api } from '..';
+
+const eventGetAll = () => {
+  return api.get<never, EventDto[]>('/event');
+};
+
+export const useEventGetAll = (options?: QueryOptions<EventDto[]>) => {
+  return useQuery(['event'], eventGetAll, options);
+};

apps/web/src/components/Button/Button.module.scss

@@ -1,21 +1,63 @@
 .button {
-  background-color: #5cc2a0;
-  color: #fff;
-  border: 2px solid #5cc2a0;
-  padding: 9px 26px;
-  border-radius: 5px;
+  border: none;
+  outline: none;
+  margin: 0;
+  padding: 14px 16px;
+  background: white;
+  position: relative;
+  transition: 300ms;
+
+  .text {
+    position: relative;
+    margin: 0;
+    color: #121212;
+    font-feature-settings:
+      'ss09' on,
+      'ss07' on,
+      'ss06' on,
+      'ss08' on,
+      'ss03' on;
+    font-family: 'PP Neue Montreal Mono';
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 500;
+    letter-spacing: 1px;
+    text-transform: uppercase;
+  }
+
   cursor: pointer;
-  font-size: 16px;
-  font-weight: 600;
-  transition: all 0.3s ease-in-out;
-  display: block;
 
-  &.primary {
-    background-color: #5cc2a0;
+  &:before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 600 600'%3E%3Cfilter id='a'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='.4' numOctaves='3' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23a)'/%3E%3C/svg%3E");
+    background-size: cover;
+    opacity: 0;
+    z-index: 0;
+    transition: 300ms;
+  }
+
+  &:hover {
+    overflow: hidden;
+    background-color: rgb(17, 17, 17);
+
+    .text {
+      color: white;
+      z-index: 5;
+    }
+
+    &:before {
+      opacity: 0.2;
+    }
   }
 
-  &.secondary {
-    background-color: #fff;
-    color: #5cc2a0;
+  &:active {
+    &::before {
+      opacity: 0.85;
+    }
   }
 }

apps/web/src/components/Button/Button.tsx

@@ -4,23 +4,15 @@ import c from './Button.module.scss';
 
 type ButtonProps = {
   children: React.ReactNode;
-  variant?: 'primary' | 'secondary';
 } & React.ButtonHTMLAttributes<HTMLButtonElement>;
 
-export const Button: React.FC<ButtonProps> = ({
-  children,
-  variant = 'primary',
-  className,
-  ...handlers
-}) => {
+const Button = ({ children, className, ...handlers }: ButtonProps) => {
+  const classes = clsx(className, c.button);
   return (
-    <button
-      className={clsx(c.button, className, {
-        [c.primary]: variant === 'primary',
-        [c.secondary]: variant === 'secondary',
-      })}
-      {...handlers}>
-      {children}
+    <button className={classes} {...handlers}>
+      <p className={c.text}>{children}</p>
     </button>
   );
 };
+
+export default Button;

apps/web/src/components/Button/index.ts

@@ -1 +1,3 @@
-export * from './Button';
+import Button from './Button';
+
+export default Button;