Merge branch 'MemeLabs:master' into master

.env.dev

@@ -1,3 +1,4 @@
 LOGIN_URI=https://strims.gg/login
+RUSTLA_URL=https://strims.gg
 WEBSOCKET_URI=wss://chat2.strims.gg/ws
 API_URI=https://chat2.strims.gg

.env.example

@@ -1,5 +1,6 @@
 API_URI=
 LOGIN_URI=
+RUSTLA_URL=https://strims.gg
 WEBSOCKET_URI=wss://chat.strims.gg/ws
 WEBPACK_DEVSERVER_HOST=
 WEBPACK_DEVSERVER_HTTPS=true

.env.prod

@@ -1,3 +1,4 @@
 LOGIN_URI=https://strims.gg/login
+RUSTLA_URL=https://strims.gg
 WEBSOCKET_URI=wss://chat.strims.gg/ws
 API_URI=https://chat.strims.gg

.github/workflows/deploy.yml

@@ -16,11 +16,11 @@ jobs:
       env:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-      run: docker login https://docker.pkg.github.com -u ${username} -p ${password}
+      run: docker login https://ghcr.io -u ${username} -p ${password}
     - name: Build image
-      run: docker build . -t docker.pkg.github.com/memelabs/chat-gui/chat-gui:latest
+      run: docker build . -t ghcr.io/memelabs/chat-gui/chat-gui:latest
     - name: Publish image
-      run: docker push docker.pkg.github.com/memelabs/chat-gui/chat-gui:latest
+      run: docker push ghcr.io/memelabs/chat-gui/chat-gui:latest
     - name: ssh-deploy for chat-gui
       uses: appleboy/ssh-action@122f35dca5c7a216463c504741deb0de5b301953
       with:
@@ -29,3 +29,9 @@ jobs:
         key: ${{ secrets.KEY }}
         script: |
           ./hooks/chat-gui.sh
+    - name: Purge cache
+      run: |
+        curl -X DELETE "https://api.cloudflare.com/client/v4/zones/${{ secrets.CF_RUSTLA2_ZONE }}/purge_cache" \
+             -H "Authorization: Bearer ${{ secrets.CF_TOKEN }}" \
+             -H "Content-Type:application/json" \
+             --data '{"purge_everything": true}'

.github/workflows/dev-deploy.yml

@@ -16,11 +16,11 @@ jobs:
       env:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-      run: docker login https://docker.pkg.github.com -u ${username} -p ${password}
+      run: docker login https://ghcr.io -u ${username} -p ${password}
     - name: Build image
-      run: docker build . -t docker.pkg.github.com/memelabs/chat-gui/chat-gui:dev --build-arg ENV_SRC=.env.dev
+      run: docker build . -t ghcr.io/memelabs/chat-gui/chat-gui:dev --build-arg ENV_SRC=.env.dev
     - name: Publish image
-      run: docker push docker.pkg.github.com/memelabs/chat-gui/chat-gui:dev
+      run: docker push ghcr.io/memelabs/chat-gui/chat-gui:dev
     - name: ssh-deploy for dev-chat-gui
       uses: appleboy/ssh-action@122f35dca5c7a216463c504741deb0de5b301953
       with:

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.18.0-alpine AS build
+FROM node:14-alpine AS build
 
 RUN mkdir /ui
 WORKDIR /ui

assets/.eslintrc.js

@@ -4,7 +4,8 @@ module.exports = {
     globals: {
         API_URI: false,
         LOGIN_URI: false,
-        WEBSOCKET_URI: false
+        WEBSOCKET_URI: false,
+        RUSTLA_URL: false
     },
     env: {
         browser: true,

assets/anim.december.scss

@@ -0,0 +1,209 @@
+@include sprite-animation(
+    $file-name: COGGERS,
+    $frame-count: 60,
+    $sprite-width: 1680px,
+    $sprite-height: 28px,
+    $animation-duration: 1800ms,
+    $iteration-count: 2
+);
+
+@include sprite-animation(
+    $file-name: PepoDance,
+    $frame-count: 10,
+    $sprite-width: 280px,
+    $sprite-height: 28px,
+    $animation-duration: 500ms,
+    $iteration-count: 5
+);
+
+@include sprite-animation(
+    $file-name: LAG,
+    $frame-count: 10,
+    $sprite-width: 390px,
+    $sprite-height: 32px,
+    $animation-duration: 4000ms,
+    $iteration-count: 2,
+    $end-on-last-frame: true,
+    $can-animate-forever: false
+);
+
+@include sprite-animation(
+    $file-name: VroomVroom,
+    $frame-count: 76,
+    $sprite-width: 7296px,
+    $sprite-height: 32px,
+    $animation-duration: 5320ms,
+    $iteration-count: 1
+);
+
+@include sprite-animation(
+    $file-name: WAG,
+    $frame-count: 2,
+    $sprite-width: 84px,
+    $sprite-height: 32px,
+    $animation-duration: 500ms,
+    $iteration-count: 10
+);
+
+@include sprite-animation(
+    $file-name: SNOWBALL,
+    $frame-count: 35,
+    $sprite-width: 1750px,
+    $sprite-height: 32px,
+    $animation-duration: 2450ms,
+    $iteration-count: 2,
+    $can-animate-forever: true
+);
+
+@include sprite-animation(
+    $file-name: PeepoS,
+    $frame-count: 35,
+    $sprite-width: 1750px,
+    $sprite-height: 32px,
+    $animation-duration: 2450ms,
+    $iteration-count: 2,
+    $can-animate-forever: true
+);
+
+@include sprite-animation(
+    $file-name: PepoFight,
+    $frame-count: 35,
+    $sprite-width: 1855px,
+    $sprite-height: 32px,
+    $animation-duration: 2450ms,
+    $iteration-count: 2,
+    $can-animate-forever: true
+);
+
+@include sprite-animation(
+    $file-name: PeepoWeird,
+    $frame-count: 35,
+    $sprite-width: 1750px,
+    $sprite-height: 32px,
+    $animation-duration: 2450ms,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: SNOWBALLFIGHT,
+    $frame-count: 70,
+    $sprite-width: 3500px,
+    $sprite-height: 32px,
+    $animation-duration: 4900ms,
+    $iteration-count: 1,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: PepoSleep,
+    $frame-count: 91,
+    $sprite-width: 5642px,
+    $sprite-height: 32px,
+    $animation-duration: 6370ms,
+    $iteration-count: 1,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: OMEGALUL,
+    $frame-count: 11,
+    $sprite-width: 330px,
+    $sprite-height: 32px,
+    $animation-duration: 3080ms,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: PauseChamp,
+    $frame-count: 80,
+    $sprite-width: 6480px,
+    $sprite-height: 32px,
+    $animation-duration: 1.2s,
+    $iteration-count: 4,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: DOGGO,
+    $frame-count: 181,
+    $sprite-width: 6154px,
+    $sprite-height: 32px,
+    $animation-duration: 3s,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: ApeHands,
+    $frame-count: 91,
+    $sprite-width: 2912px,
+    $sprite-height: 32px,
+    $animation-duration: 2s,
+    $iteration-count: 3,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: SMUG,
+    $frame-count: 7,
+    $sprite-width: 238px,
+    $sprite-height: 32px,
+    $animation-duration: 1s,
+    $iteration-count: 3,
+    $can-animate-forever: true,
+    $extra-animation: true,
+    $extra-animation-duration: 333ms,
+    $extra-animation-iteration-count: 9
+) {
+    0% {
+        transform: translate(0px,0px);
+    }
+    25% {
+        transform: translate(0px,0.50px);
+        animation-timing-function: ease-in;
+    }
+    37% {
+        transform: translate(0px,0px);
+    }
+    55% {
+        transform: translate(0px,-2px);
+    }
+    60% {
+        transform: translate(0px,-1.5px);
+        animation-timing-function: ease;
+    }
+    100% {
+        transform: translate(0px,0px);
+    }
+}
+
+@include sprite-animation(
+    $file-name: TIMID,
+    $frame-count: 12,
+    $sprite-width: 384px,
+    $sprite-height: 32px,
+    $animation-duration: 1s,
+    $iteration-count: 1,
+    $end-on-last-frame: true,
+    $can-animate-forever: false,
+    $extra-animation: true,
+    $extra-animation-duration: 6s,
+    $extra-animation-delay: 500ms,
+    $extra-animation-iteration-count: 1
+) {
+    0% {background-position-y: 0px; }
+    10% {background-position-y: 20px; }
+}
+
+.generify-emote-TIMID:not(.chat-user + .generify-emote-TIMID) .chat-emote-TIMID {
+    background-position-x: 0px !important;
+}

assets/anim.lotr.scss

@@ -0,0 +1,73 @@
+@include sprite-animation(
+    $file-name: DOGGO,
+    $frame-count: 76,
+    $sprite-width: 2432px,
+    $sprite-height: 32px,
+    $animation-duration: 2s,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: ComfyMoobers,
+    $frame-count: 34,
+    $sprite-width: 1122px,
+    $sprite-height: 32px,
+    $animation-duration: 2550ms,
+    $iteration-count: 2,
+    $can-animate-forever: true
+);
+
+@include sprite-animation(
+    $file-name: CampFire,
+    $frame-count: 90,
+    $sprite-width: 3780px,
+    $sprite-height: 32px,
+    $animation-duration: 3s,
+    $iteration-count: 1,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: ZOOMER,
+    $frame-count: 30,
+    $sprite-width: 1500px,
+    $sprite-height: 32px,
+    $animation-duration: 1s,
+    $iteration-count: 7,
+    $can-animate-forever: true
+);
+
+@include sprite-animation(
+    $file-name: GROND,
+    $frame-count: 149,
+    $sprite-width: 7450px,
+    $sprite-height: 32px,
+    $animation-duration: 6.208s,
+    $iteration-count: 1,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: BOOMER,
+    $frame-count: 90,
+    $sprite-width: 4050px,
+    $sprite-height: 32px,
+    $animation-duration: 3s,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: SPYRON,
+    $frame-count: 90,
+    $sprite-width: 3960px,
+    $sprite-height: 32px,
+    $animation-duration: 3s,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+);