Merge pull request #15 from FabienBounoir/beta

New version 2.8.0
FabienBounoir · May 17, 2024 · c9604eb · c9604eb
2 parents 5b84bb5 + 3c9cca3
commit c9604eb
Show file tree

Hide file tree

Showing 37 changed files with 970 additions and 462 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -3,39 +3,16 @@ on:
   release:
     types: [ created ]
 jobs:
-  build-and-deploy:
+  build:
     runs-on: ubuntu-latest
 
-    env:
-      CI: false
-      REACT_APP_OAUTH2_LINK: ${{ secrets.REACT_APP_OAUTH2_LINK }}
-      REACT_APP_CLIENT_ID: ${{ secrets.REACT_APP_CLIENT_ID }}
-      REACT_APP_CLIENT_SECRET: ${{ secrets.REACT_APP_CLIENT_SECRET}}
-      REACT_APP_HOSTNAME: ${{ secrets.REACT_APP_HOSTNAME }}
-      REACT_APP_HOSTNAME_BACKEND: ${{ secrets.REACT_APP_HOSTNAME_BACKEND }}
-      REACT_APP_REDIRECT_URI: ${{ secrets.REACT_APP_REDIRECT_URI }}
-
     steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js 16
-      uses: actions/setup-node@v1
-      with:
-        node-version: 16
-    - name: Install dependencies
-      run: npm install
-
-    - name: Build
-      run: npm run build
-
-    - name: Remove old build + copy new build to vps
-      uses: appleboy/scp-action@master
-      with:
-        host: ${{ secrets.HOST }}
-        username: ${{ secrets.USERNAME }}
-        password: ${{ secrets.PASSWORD }}
-        port: ${{ secrets.PORT }}
-        source: "./build/*"
-        target: "/root/front/build"
-        strip_components: 1
-        rm: true
+      - name: Execute build commande
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          USERNAME: ${{ secrets.USERNAME }}
+          PORT: ${{ secrets.PORT }}
+          KEY: ${{ secrets.SSHKEY }}
+          script: cd /opt/bouns-bot && git stash && git pull && npm run build
 
diff --git a/public/automod.png b/public/automod.png
diff --git a/src/app/App.css b/src/app/App.css
@@ -24,13 +24,13 @@ h1, h2, h3 {
 }
 
 *::-moz-selection {
-  background-color: var(--color-principal);
+  background-color: rgba(var(--color-red), var(--color-green), var(--color-blue), 0.3);
   color: #fff;
 }
 
 /* pour Safari et Chrome */
 *::selection {
-  background-color: var(--color-principal);
+  background-color: rgba(var(--color-red), var(--color-green), var(--color-blue), 0.3);
   color: #fff;
 }
 
@@ -53,10 +53,6 @@ h1, h2, h3 {
 
 }
 
-/* .App {
-  text-align: center;
-} */
-
 .App-header {
   background-color: #282c34;
   min-height: 100vh;

diff --git a/src/components/addBot/_addBot.css b/src/components/addBot/_addBot.css
@@ -13,10 +13,17 @@
     padding-bottom: 4rem !important;
     padding-left: 2.5rem !important;
     padding-right: 2.5rem !important;
+
+    display: flex;
+    flex-direction: column;
+
+    text-align: center;
+    text-wrap: balance;
 }
 
 .brand-add-bot .container h2 {
-    color: #fff !important
+    color: #fff !important;
+
 }
 
 .brand-add-bot .container button {

diff --git a/src/components/approvedBy/_approvedBy.css b/src/components/approvedBy/_approvedBy.css
@@ -196,13 +196,14 @@
     -webkit-box-pack: center;
     justify-content: center;
     z-index: 4;
+    text-align: center;
+    text-wrap: balance;
 }
 
 
 .infoComponent .guilds-container .guilds {
     background-color: #FFFFFF;
     color: #17181e;
-    border: 2px solid #BABABB;
     filter: drop-shadow(1px 3px 9px var(--color-principal-hover));
 
     display: flex;

diff --git a/src/components/configuration/_configuration.css b/src/components/configuration/_configuration.css
@@ -127,7 +127,7 @@
 }
 
 .configList .element:hover {
-    background-color: rgba(255, 255, 255, 0.1);
+    background-color: rgba(255, 255, 255, 0.06);
 }
 
 .configList .element div svg {

diff --git a/src/components/configuration/configuration.jsx b/src/components/configuration/configuration.jsx
@@ -100,13 +100,11 @@ export const Configuration = (props) => {
                         },
                         {
                             "name": "dashboard.menu.moderation",
-                            "url": "moderation",
-                            "new": true
+                            "url": "moderation"
                         },
                         {
                             "name": "dashboard.menu.infractions",
-                            "url": "infractions",
-                            "new": true
+                            "url": "infractions"
                         }
                     ]
                 },