remove unnecessary lines from manifest.tmpl

chore(deps): update node.js to v14.19.2

.circleci/config.yml

@@ -1,49 +0,0 @@
-version: 2
-jobs:
-  build_latest:
-    docker:
-      - image: circleci/node:14.17.3-browsers
-    working_directory: ~/zdamegzzawodowyadminpanel
-    steps:
-      - checkout
-      - setup_remote_docker:
-          version: 20.10.2
-      - run: |
-          docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-      # build the application image
-      - run: docker build -t $DOCKER_LOGIN/zdam-egzamin-zawodowy-admin-panel:latest .
-      # deploy the image
-      - run: docker push $DOCKER_LOGIN/zdam-egzamin-zawodowy-admin-panel:latest
-  build_version:
-    docker:
-      - image: circleci/node:14.17.3-browsers
-    working_directory: ~/zdamegzzawodowyadminpanel
-    steps:
-      - checkout
-      - setup_remote_docker:
-          version: 20.10.2
-      - run: |
-          docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-      # build the application image
-      - run: docker build -t $DOCKER_LOGIN/zdam-egzamin-zawodowy-admin-panel:$(echo $CIRCLE_TAG | sed -r 's/^.{1}//') .
-      # deploy the image
-      - run: docker push $DOCKER_LOGIN/zdam-egzamin-zawodowy-admin-panel:$(echo $CIRCLE_TAG | sed -r 's/^.{1}//')
-workflows:
-  version: 2
-  deploy_latest:
-    jobs:
-      - build_latest:
-          context: Zdam-Egzamin-Zawodowy
-          filters:
-            branches:
-              only:
-                - master
-  deploy_version:
-    jobs:
-      - build_version:
-          context: Zdam-Egzamin-Zawodowy
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore: /.*/

.drone.yml

@@ -0,0 +1,59 @@
+---
+kind: pipeline
+type: docker
+name: linux-amd64
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  - name: publish
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      registry: gitea.dwysokinski.me
+      repo: gitea.dwysokinski.me/zdam-egzamin-zawodowy-docker/admin-panel
+      auto_tag: true
+      auto_tag_suffix: linux-amd64
+      dockerfile: Dockerfile
+
+trigger:
+  event:
+    - tag
+---
+kind: pipeline
+type: docker
+name: manifest
+
+steps:
+  - name: manifest
+    image: plugins/manifest
+    settings:
+      auto_tag: "true"
+      ignore_missing: "true"
+      spec: manifest.tmpl
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+  - name: manifest-latest
+    image: plugins/manifest
+    settings:
+      tags: latest
+      ignore_missing: "true"
+      spec: manifest.tmpl
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+
+trigger:
+  event:
+    - tag
+
+depends_on:
+  - linux-amd64

.env.development

@@ -0,0 +1 @@
+REACT_APP_VERSION=development

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.17.3-alpine as build-deps
+FROM node:14.19.2-alpine as build-deps
 
 #Stage 1
 
@@ -6,7 +6,9 @@ WORKDIR /usr/src/app
 COPY package.json yarn.lock ./
 RUN yarn
 COPY . ./
+
 ENV NODE_ENV=production
+
 RUN yarn build
 
 #Stage 2

README.md

@@ -1,27 +1,7 @@
-# zdamegzaminzawodowy.pl Admin Panel
+# Admin panel
 
 ![Screenshot](/screenshots/professionspage.png?raw=true)
 
-## Development
-
-### Prerequisites
-
-1. Node.JS
-2. yarn
-3. [Configured backend](https://github.com/zdam-egzamin-zawodowy/backend)
-
-### Installation
-
-1. Clone this repo
-
-```
-git clone git@github.com:zdam-egzamin-zawodowy/admin-panel.git
-```
-
-2. Navigate to the directory where you have cloned this repo.
-3. ``yarn install``
-4. ``yarn run start``
-
 ## License
 
 Distributed under the MIT License. See ``LICENSE`` for more information.

manifest.tmpl

@@ -0,0 +1,13 @@
+image: gitea.dwysokinski.me/zdam-egzamin-zawodowy-docker/admin-panel:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  -
+    image: gitea.dwysokinski.me/zdam-egzamin-zawodowy-docker/admin-panel:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
+    platform:
+      architecture: amd64
+      os: linux

package.json

@@ -15,7 +15,7 @@
     "@types/node": "^14.0.0",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
-    "apollo-upload-client": "^14.1.3",
+    "apollo-upload-client": "^16.0.0",
     "clsx": "^1.1.1",
     "date-fns": "^2.22.1",
     "graphql": "^15.5.0",
@@ -32,7 +32,7 @@
     "typescript": "^4.1.2",
     "use-query-params": "^1.2.2",
     "validator": "^13.6.0",
-    "web-vitals": "^1.1.1"
+    "web-vitals": "^2.0.0"
   },
   "scripts": {
     "start": "react-app-rewired start",
@@ -69,9 +69,9 @@
     ]
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "1.21.6",
-    "@graphql-codegen/typescript": "1.22.4",
-    "@graphql-codegen/typescript-operations": "1.18.3",
+    "@graphql-codegen/cli": "2.3.0",
+    "@graphql-codegen/typescript": "2.4.1",
+    "@graphql-codegen/typescript-operations": "2.2.1",
     "@types/apollo-upload-client": "^14.1.0",
     "@types/lodash": "^4.14.168",
     "@types/react-router-dom": "^5.1.7",

src/libs/auth/Provider.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useState, useEffect } from 'react';
+import { useMemo, useState, useEffect, useCallback } from 'react';
 import { useApolloClient } from '@apollo/client';
 import { isFunction } from 'lodash';
 import { context as Context } from './context';
@@ -7,7 +7,6 @@ import { MutationSignInArgs, Mutation } from 'libs/graphql/types';
 import TokenStorage from '../tokenstorage/TokenStorage';
 import { QUERY_ME } from './queries';
 import { MUTATION_SIGN_IN } from './mutations';
-import { useCallback } from 'react';
 
 export interface AuthProviderProps {
   tokenStorage?: TokenStorage;
@@ -22,29 +21,35 @@ export function AuthProvider(props: AuthProviderProps) {
   const client = useApolloClient();
   const [user, setUser] = useState<AuthContext['user']>(null);
   const [loading, setLoading] = useState<boolean>(true);
+
   const tokenStorage = useMemo(() => {
     if (props.tokenStorage) {
       return props.tokenStorage;
     }
     return new TokenStorage();
   }, [props.tokenStorage]);
+
   const loadUser = useCallback(async () => {
-    if (tokenStorage.token) {
-      try {
-        const result = await client.query<MeQueryResult>({
-          query: QUERY_ME,
-          fetchPolicy: 'network-only',
-        });
-        if (result.data.me) {
-          setUser(result.data.me);
-        }
-      } catch (e) {}
+    if (!tokenStorage.token) {
+      return;
     }
-    setLoading(false);
-  }, [setUser, setLoading, client, tokenStorage]);
+
+    try {
+      const result = await client.query<MeQueryResult>({
+        query: QUERY_ME,
+        fetchPolicy: 'network-only',
+      });
+      if (result.data.me) {
+        setUser(result.data.me);
+      }
+    } catch (e) {}
+  }, [setUser, client, tokenStorage]);
+
   useEffect(() => {
-    loadUser();
-  }, [loadUser]);
+    loadUser().finally(() => {
+      setLoading(false);
+    });
+  }, [loadUser, setLoading]);
 
   const signIn: AuthContext['signIn'] = async (
     email: string,
@@ -64,22 +69,24 @@ export function AuthProvider(props: AuthProviderProps) {
       },
     });
 
-    if (result.data?.signIn?.user) {
-      if (isFunction(validate) && !validate(result.data.signIn.user)) {
-        return null;
-      }
-      tokenStorage.setToken(result.data.signIn.token);
-      setUser(result.data.signIn.user);
-      client.writeQuery<MeQueryResult>({
-        query: QUERY_ME,
-        data: {
-          me: result.data.signIn.user,
-        },
-      });
-      return result.data.signIn.user;
+    if (!result.data?.signIn?.user) {
+      return null;
     }
 
-    return null;
+    if (isFunction(validate) && !validate(result.data.signIn.user)) {
+      return null;
+    }
+
+    tokenStorage.setToken(result.data.signIn.token);
+    setUser(result.data.signIn.user);
+    client.writeQuery<MeQueryResult>({
+      query: QUERY_ME,
+      data: {
+        me: result.data.signIn.user,
+      },
+    });
+
+    return result.data.signIn.user;
   };
 
   const signOut = () => {