Merge pull request #131 from FileFighter/feature/profile

Feature/profile

Author: Gimleux

.github/workflows/latestRelease.yml

@@ -51,4 +51,4 @@ jobs:
       -
         name: Trigger update on server
         run: |
-          curl -u ${{ secrets.LOG_CREDS }} https://logs.filefighter.de/filefighter-update.log
+          curl -f -u ${{ secrets.LOG_CREDS }} https://logs.filefighter.de/filefighter-update-script.log

.gitignore

@@ -83,8 +83,8 @@ local.properties
 */.idea/**/contentModel.xml
 
 */.idea/
-
 /.idea
+.idea/
 
 WebApp.iml
 

cypress/integration/filesystem.js

@@ -7,7 +7,7 @@ describe("The filesystem page", () => {
   });
 
   it("changes the url when you click on a file", () => {
-    cy.get("div").contains("dummyFile.txt").click();
-    cy.url().should("include", "#dummyFile.txt");
+    cy.get("div").contains("user1").click();
+    cy.url().should("include", "/user1");
   });
 });

cypress/integration/login_spec.js

@@ -6,8 +6,8 @@ describe('The Home Page', () => {
 
     it('sets auth cookie when logging in via form submission', function () {
         // destructuring assignment of the this.currentUser object
-        const  username = 'admin';
-        const  password = 'admin';
+        const  username = 'user1';
+        const  password = '12345';
 
         //cy.visit('/login')
 

cypress/support/commands.js

@@ -11,7 +11,7 @@
 //
 // -- This is a parent command --
 Cypress.Commands.add('loginWithUrl', (path) => {
-    const user = {username:"admin",password:"admin"}
+    const user = {username:"user",password:"1234"}
 
     cy.visit(path)
     cy.get('input[id=formBasicUsername]')

package-lock.json

@@ -18,9 +18,9 @@
     "bootstrap": "4.6.0",
     "eslint-plugin-react-hooks": "4.2.0",
     "node-sass": "4.14.1",
-    "react": "17.0.1",
+    "react": "^16.14.0",
     "react-bootstrap": "1.5.2",
-    "react-dom": "17.0.1",
+    "react-dom": "^16.14.0",
     "react-redux": "7.2.2",
     "react-router-dom": "5.2.0",
     "react-scripts": "4.0.3",
@@ -54,7 +54,7 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "7.12.3",
+    "@babel/core": "^7.13.14",
     "@storybook/addon-actions": "6.1.21",
     "@storybook/addon-essentials": "6.1.21",
     "@storybook/addon-links": "6.1.21",

package.json

@@ -1026,21 +1026,66 @@ exports[`Storyshots Login onlyInput 1`] = `
 </div>
 `;
 
+exports[`Storyshots Profile default 1`] = `
+<div
+  className="page-content container"
+>
+  <div
+    className="px-1 w-100 mt-1 mb-3 "
+  >
+    <div
+      className="w-100 title-action"
+    >
+      <h1
+        className="mr-1 h4"
+      >
+        My Profile
+      </h1>
+      <button
+        className="btn btn-primary"
+        disabled={false}
+        onClick={[Function]}
+        type="button"
+      >
+        <img
+          alt="edit icon"
+          className="pr-2"
+          src="edit_white_24dp.svg"
+        />
+        Edit
+      </button>
+    </div>
+  </div>
+  <div
+    className="profile-information-display p-0 w-100"
+  >
+    <h2
+      className="h3 pb-3"
+    />
+    <dl>
+      <dt>
+        Username
+      </dt>
+      <dd />
+      <dt>
+        Groups
+      </dt>
+      <dd />
+    </dl>
+  </div>
+</div>
+`;
+
 exports[`Storyshots Registration default 1`] = `
 <div
-  className="h-100 container"
+  className="container"
   id="registrationContainer"
-  style={
-    Object {
-      "position": "relative",
-    }
-  }
 >
   <div
     className="row"
   >
     <div
-      className="col-md-6 offset-md-3"
+      className="px-3 w-100"
     >
       <h1>
         Create new account

src/__tests__/__snapshots__/storybook.test.ts.snap

@@ -10,9 +10,9 @@ import {
   checkedCookies,
   removeTokens
 } from "../redux/actions/tokens";
-import { addUser } from "../redux/actions/user";
 import { AccessToken, CookieStatus } from "../redux/actions/tokenTypes";
 import { deleteCookie, getCookie, setCookie } from "../methods/cookies";
+import {updateUser} from "../redux/actions/user";
 
 // reference: https://daveceddia.com/access-redux-store-outside-react/
 
@@ -57,7 +57,7 @@ export const loginWithUsernameAndPassword = (
       .then((data: AxiosResponse<BackendLoginData>) => {
         console.log(data.data);
         store.dispatch(addRefreshToken(data.data.tokenValue));
-        store.dispatch(addUser(data.data.user as UserState));
+        store.dispatch(updateUser(data.data.user as UserState));
 
         if (stayLoggedIn) {
           setCookie(cookieName, data.data.tokenValue, 60);
@@ -109,7 +109,7 @@ export const getAccessTokenWithRefreshToken = () => {
 const getOwnUserData = (userId: number) => {
   Axios.get<UserState>(`${hostname}${userPath}/${userId}/info`)
     .then((response: AxiosResponse<UserState>) => {
-      store.dispatch(addUser(response.data));
+      store.dispatch(updateUser(response.data));
     })
     .catch((error) => {
       console.log(error);