Merge branch 'dev' of https://git.vladimirkutkovoy.ru/vladimirkutkovoy/SKB-online-sites into dev

.drone.yml

@@ -1,51 +1,12 @@
 kind: pipeline
-type: docker
+name: default
-name: build-and-deploy
 
 steps:
-- name: install_and_build
+- name: test_node123
-  image: node:18
+  image: node
   commands:
-    - npm install
+  - npm install
-    - npm run build
+  - npm run build
-
-- name: deploy
-  image: appleboy/drone-scp
-  settings:
-    host: 192.168.0.129
-    username: 
-      from_secret: username_deploy
-    password: 
-      from_secret: password_deploy
-    port: 22
-    target: /root/docker/nginx/www_data
-    source: build
-  
-- name: telegram notification
-  image: appleboy/drone-telegram
-  settings:
-    token: 
-      from_secret: telegram_token
-    to: 
-      from_secret: telegram_to
-    format: markdown
   when:
-      status:
+    branch:
-          - success
+    - dev
-          - failure
-  message: >
-    {{#success build.status}}
-    ✅ Build #{{build.number}} of `{{repo.name}}` succeeded.
-    📝 Commit by {{commit.author}} on `{{commit.branch}}`:
-    ```
-    {{commit.message}}
-    ```
-    🌐 {{ build.link }}
-    {{else}}
-    ❌ Build #{{build.number}} of `{{repo.name}}` failed.
-    📝 Commit by {{commit.author}} on `{{commit.branch}}`:
-    ```
-    {{commit.message}}
-    ```
-    🌐 {{ build.link }}
-    {{/success}}        

src/App.js

@@ -87,6 +87,7 @@ const App = () => {
             <Th>ФИО</Th>
             <Th>Лаборатория</Th>
             <Th>Время входа</Th>
+			<Th>ОФис</Th>
           </tr>
         </thead>
         <tbody>
@@ -97,6 +98,7 @@ const App = () => {
               <Td>{item.name}</Td>
               <Td>{item.lab}</Td>
               <Td>{item.timeIn}</Td>
+              <Td>{item.officeName}</Td>
             </Tr>
           ))}
         </tbody>