Головна сторінка Огляд Довідка
Увійти
ramonaPlogmann
/
emilia
1
0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

get own Auth0 and fix things accordingly

Ramona 1 рік тому
батько
3a176db068
коміт
12cab86bf3
7 змінених файлів з 103 додано та 16 видалено
Розділений вигляд Показати статистику Diff
  1. 2 1
      .gitignore
  2. 3 3
      client/.env
  3. 0 2
      client/package-lock.json
  4. 4 9
      client/public/index.html
  5. 2 1
      client/src/components/Settings/Settings.jsx
  6. 87 0
      package-lock.json
  7. 5 0
      package.json

+ 2 - 1
.gitignore
Переглянути файл 

@@ -5,4 +5,5 @@ server/.env
 
 server/uploads/mealImages/1616522970276-ACtC-3d5MANMrywGr3uAd1-Z9NgpEVpKsyyQo7-MlgztiXantk3cWjVIrjPWmOLoQxybnyv7WGa0dpWCkda2YgONk2jjIv8APM5k-j39dezcI8X4ANUuHB-KniG4auchmdP-q2jUngfCSkYnPgfvXLNrlYcYEQ=s640-no.jpg
 
 client/build/
 
 client/docs/
 
-server/uploads/
 
+server/uploads/
 
+node_modules/

+ 3 - 3
client/.env
Переглянути файл 

@@ -1,8 +1,8 @@
 
-REACT_APP_SERVER_URL=https://emealay-server.cyclic.app
 
+REACT_APP_SERVER_URL=http://localhost:5000
 
 REACT_APP_NAV_BOTTOM_HEIGHT=60
 
 REACT_APP_NAV_TOP_HEIGHT=45
 
 REACT_APP_GRID_LIST_ROW_HEIGHT=125
 
 REACT_APP_LOGIN_REDIRECT=http://localhost:3000/
 
 REACT_APP_LOGOUT_REDIRECT=http://localhost:3000/
 
-REACT_APP_AUTH0_DOMAIN=emealay.eu.auth0.com
 
-REACT_APP_AUTH0_CLIENT_ID=UNfghTAFOtxlEzYL49xiUqFZ9aRNabcX
 
+REACT_APP_AUTH0_DOMAIN=emilia-app.eu.auth0.com
 
+REACT_APP_AUTH0_CLIENT_ID=IjDe332cWgw1qKXNm270CSS4PZDZm99I

+ 0 - 2
client/package-lock.json
Переглянути файл 

@@ -3318,7 +3318,6 @@
 
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
 
       "dev": true
 
     },
 
-    "node_modules/@types/react": {},
 
     "node_modules/@types/react-test-renderer": {
 
       "version": "18.0.0",
 
       "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-18.0.0.tgz",
 
@@ -32218,7 +32217,6 @@
 
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
 
       "dev": true
 
     },
 
-    "@types/react": {},
 
     "@types/react-test-renderer": {
 
       "version": "18.0.0",
 
       "resolved": "https://registry.npmjs.org/@types/react-test-renderer/-/react-test-renderer-18.0.0.tgz",

+ 4 - 9
client/public/index.html
Переглянути файл 

@@ -3,14 +3,11 @@
 
   <head>
 
     <meta charset="utf-8" />
 
 
-    <!--
 
-      app.webmanifest provides metadata used when your web app is installed on a
 
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
 
-    -->
 
+    <title>Emilia</title>
 
+
 
     <link rel="manifest" href="%PUBLIC_URL%/app.webmanifest" />
 
     <!--
 
-      Notice the use of %PUBLIC_URL% in the tags above.
 
-      It will be replaced with the URL of the `public` folder during the build.
 
+      %PUBLIC_URL% will be replaced with the URL of the `public` folder during the build.
 
       Only files inside the `public` folder can be referenced from the HTML.
 
 
       Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
 
@@ -25,7 +22,7 @@
 
     <link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon-16x16.png">
 
     <link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#3cb45a">
 
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
 
-    <meta name="msapplication-TileColor" content="#3cb45a">
 
+    <meta name="msapplication-TileColor" content="#28793c">
 
     <meta name="msapplication-config" content="%PUBLIC_URL%/browserconfig.xml">
 
     <meta name="theme-color" content="#3cb45a">
 
 
@@ -83,8 +80,6 @@
 
     <link rel="apple-touch-startup-image" media="screen and (device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="%PUBLIC_URL%/10.2__iPad_portrait.png">
 
     <link rel="apple-touch-startup-image" media="screen and (device-width: 810px) and (device-height: 1080px) and (-webkit-device-pixel-ratio: 2) and (orientation: landscape)" href="%PUBLIC_URL%/10.2__iPad_landscape.png">
 
     <link rel="apple-touch-startup-image" media="screen and (device-width: 414px) and (device-height: 896px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)" href="%PUBLIC_URL%/iPhone_11__iPhone_XR_portrait.png">
 
-
 
-    <title>Emilia</title>
 
   </head>
 
   <body style="margin: 0; height: 100%; overflow-x: hidden;">
 
     <div id="root" style="height: 100%"></div>

+ 2 - 1
client/src/components/Settings/Settings.jsx
Переглянути файл 

@@ -109,6 +109,7 @@ const Settings = (props) => {
 
       const userId = user.sub;
 
       getUserById(userId, (user) => {
 
         setUserData(user);
 
+        // the metadata gets set through Auth0 Rules. It automatically injects language and locale as well as the profile picture
 
         const metadata = user.user_metadata;
 
         if (metadata && metadata.language) {
 
           if (metadata.language !== i18n.language) i18n.changeLanguage(metadata.language);
 
@@ -255,7 +256,7 @@ const Settings = (props) => {
 
 
 
       {userData &&
 
-      <EditProfile userData={userData} onUpdateUser={getUser} open={editDialogOpen} closeDialog={closeEditProfileDialog} isSecondary />
 
+        <EditProfile userData={userData} onUpdateUser={getUser} open={editDialogOpen} closeDialog={closeEditProfileDialog} isSecondary />
 
       }
 
     </>
 
   );

+ 87 - 0
package-lock.json
Переглянути файл 

@@ -0,0 +1,87 @@
 
+{
 
+  "name": "Emilia",
 
+  "lockfileVersion": 2,
 
+  "requires": true,
 
+  "packages": {
 
+    "": {
 
+      "dependencies": {
 
+        "@pwabuilder/pwaauth": "^0.9.7"
 
+      }
 
+    },
 
+    "node_modules/@pwabuilder/pwaauth": {
 
+      "version": "0.9.7",
 
+      "resolved": "https://registry.npmjs.org/@pwabuilder/pwaauth/-/pwaauth-0.9.7.tgz",
 
+      "integrity": "sha512-nEo8OCMXpXIap07InleQq5Cl4zgmnHRgMurnvsWb946O1gIXbrlsl6fMqCycFwA+9Jm1BbUHHHwrZUPv78ptFw==",
 
+      "dependencies": {
 
+        "lit-element": "^2.2.1",
 
+        "msal": "^1.2.1"
 
+      }
 
+    },
 
+    "node_modules/lit-element": {
 
+      "version": "2.5.1",
 
+      "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.5.1.tgz",
 
+      "integrity": "sha512-ogu7PiJTA33bEK0xGu1dmaX5vhcRjBXCFexPja0e7P7jqLhTpNKYRPmE+GmiCaRVAbiQKGkUgkh/i6+bh++dPQ==",
 
+      "dependencies": {
 
+        "lit-html": "^1.1.1"
 
+      }
 
+    },
 
+    "node_modules/lit-html": {
 
+      "version": "1.4.1",
 
+      "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.4.1.tgz",
 
+      "integrity": "sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA=="
 
+    },
 
+    "node_modules/msal": {
 
+      "version": "1.4.17",
 
+      "resolved": "https://registry.npmjs.org/msal/-/msal-1.4.17.tgz",
 
+      "integrity": "sha512-RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ==",
 
+      "dependencies": {
 
+        "tslib": "^1.9.3"
 
+      },
 
+      "engines": {
 
+        "node": ">=0.8.0"
 
+      }
 
+    },
 
+    "node_modules/tslib": {
 
+      "version": "1.14.1",
 
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
 
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
 
+    }
 
+  },
 
+  "dependencies": {
 
+    "@pwabuilder/pwaauth": {
 
+      "version": "0.9.7",
 
+      "resolved": "https://registry.npmjs.org/@pwabuilder/pwaauth/-/pwaauth-0.9.7.tgz",
 
+      "integrity": "sha512-nEo8OCMXpXIap07InleQq5Cl4zgmnHRgMurnvsWb946O1gIXbrlsl6fMqCycFwA+9Jm1BbUHHHwrZUPv78ptFw==",
 
+      "requires": {
 
+        "lit-element": "^2.2.1",
 
+        "msal": "^1.2.1"
 
+      }
 
+    },
 
+    "lit-element": {
 
+      "version": "2.5.1",
 
+      "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.5.1.tgz",
 
+      "integrity": "sha512-ogu7PiJTA33bEK0xGu1dmaX5vhcRjBXCFexPja0e7P7jqLhTpNKYRPmE+GmiCaRVAbiQKGkUgkh/i6+bh++dPQ==",
 
+      "requires": {
 
+        "lit-html": "^1.1.1"
 
+      }
 
+    },
 
+    "lit-html": {
 
+      "version": "1.4.1",
 
+      "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.4.1.tgz",
 
+      "integrity": "sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA=="
 
+    },
 
+    "msal": {
 
+      "version": "1.4.17",
 
+      "resolved": "https://registry.npmjs.org/msal/-/msal-1.4.17.tgz",
 
+      "integrity": "sha512-RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ==",
 
+      "requires": {
 
+        "tslib": "^1.9.3"
 
+      }
 
+    },
 
+    "tslib": {
 
+      "version": "1.14.1",
 
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
 
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
 
+    }
 
+  }
 
+}

+ 5 - 0
package.json
Переглянути файл 

@@ -0,0 +1,5 @@
 
+{
 
+  "dependencies": {
 
+    "@pwabuilder/pwaauth": "^0.9.7"
 
+  }
 
+}