Merge branch 'Azure-Samples:main' into main

vriosrada-msft · Mar 6, 2023 · 472a509 · 472a509
2 parents e1dd149 + 9e60ac5
commit 472a509
Show file tree

Hide file tree

Showing 17 changed files with 487 additions and 85 deletions.
diff --git a/Project/.deployment b/Project/.deployment
@@ -0,0 +1,2 @@
+[config]
+SCM_DO_BUILDDURING_DEPLOYMENT=true
diff --git a/Project/clientConfig.json b/Project/clientConfig.json
@@ -0,0 +1,4 @@
+{
+    "oneSignalAppId": "",
+    "oneSignalSafariWebId": ""
+}
diff --git a/Project/config.json b/Project/config.json
diff --git a/Project/package-lock.json b/Project/package-lock.json
diff --git a/Project/package.json b/Project/package.json
@@ -8,13 +8,17 @@
     "@azure/communication-calling-effects": "1.0.0-beta.1",
     "@fluentui/react": "^7.158.1",
     "react": "^16.14.0",
-    "react-dom": "^16.14.0"
+    "react-dom": "^16.14.0",
+    "react-onesignal": "^2.0.4"
   },
   "scripts": {
-    "start": "webpack-dev-server --port 5000 --mode development",
-    "build": "webpack --mode development"
+    "start-local": "webpack-dev-server --port 5000 --mode development",
+    "build-local": "webpack --mode development",
+    "start": "webpack-dev-server --host 0.0.0.0",
+    "build": "webpack"
   },
   "devDependencies": {
+    "axios": "^1.3.4",
     "@babel/core": "^7.8.7",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-transform-runtime": "^7.8.3",

diff --git a/Project/public/OneSignalSDKUpdaterWorker.js b/Project/public/OneSignalSDKUpdaterWorker.js
@@ -0,0 +1 @@
+importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js');
diff --git a/Project/public/OneSignalSDKWorker.js b/Project/public/OneSignalSDKWorker.js
@@ -0,0 +1 @@
+importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js');
diff --git a/Project/assets/images/ACSBackdrop.png → Project/public/assets/images/ACSBackdrop.png b/Project/assets/images/ACSBackdrop.png → Project/public/assets/images/ACSBackdrop.png
diff --git a/.../assets/images/MicrosoftLearnBackdrop.png → .../assets/images/MicrosoftLearnBackdrop.png b/.../assets/images/MicrosoftLearnBackdrop.png → .../assets/images/MicrosoftLearnBackdrop.png
diff --git a/Project/serverConfig.json b/Project/serverConfig.json
@@ -0,0 +1,7 @@
+{
+    "connectionString": "REPLACE_WITH_CONNECTION_STRING",
+    "functionAppOneSignalTokenRegistrationUrl": "",
+    "functionAppOneSignalTokenRegistrationApiKey":""
+}
+
+
diff --git a/Project/src/App.css b/Project/src/App.css
@@ -196,6 +196,41 @@ ul {
   border-bottom: 1px solid #605e5c;
 }
 
+.ms-TextField-field {
+  background-color: #292827;
+  color: #edebe9;
+  outline: 1px solid #484644;
+  box-shadow: 0px 0px 0px 2px #484644;
+}
+
+.ms-TextField-field:disabled {
+  background-color: #292827;
+  color: #484644 !important;
+  outline: 1px solid #292827;
+  box-shadow: 0px 0px 0px 2px #292827;
+}
+
+div.push-notification-options[disabled],
+div.ms-Checkbox.is-disabled > input[type="checkbox"] + label.ms-Checkbox-label > span.ms-Checkbox-text,
+.ms-TextField-field:disabled, .ms-TextField.is-disabled > .ms-TextField-wrapper > label,
+div.ms-Checkbox.is-disabled > input[type="checkbox"] + label.ms-Checkbox-label > div.ms-Checkbox-checkbox > i.ms-Checkbox-checkmark  {
+  color: #484644;
+}
+
+div.ms-Checkbox > input[type="checkbox"] + label.ms-Checkbox-label > div.ms-Checkbox-checkbox {
+  background-color: #201f1e;
+  border: 1px solid #605e5c;
+}
+
+div.ms-Checkbox.is-disabled > input[type="checkbox"] + label.ms-Checkbox-label > div.ms-Checkbox-checkbox {
+  border: 1px solid #484644;
+}
+
+div.ms-Checkbox > input[type="checkbox"] + label.ms-Checkbox-label > span.ms-Checkbox-text {
+  color: white;
+  font-size: 0.8rem;
+}
+
 .primary-button {
   color: #edebe9;
   background-color: #ca5010;
@@ -250,24 +285,6 @@ ul {
   font-size: 12px;;
 }
 
-.ms-TextField-field:disabled, .ms-TextField.is-disabled > .ms-TextField-wrapper > label {
-  color: #484644;
-}
-
-.ms-TextField-field {
-  background-color: #292827;
-  color: #edebe9;
-  outline: 1px solid #484644;
-  box-shadow: 0px 0px 0px 2px #484644;
-}
-
-.ms-TextField-field:disabled {
-  background-color: #292827;
-  color: #484644 !important;
-  outline: 1px solid #292827;
-  box-shadow: 0px 0px 0px 2px #292827;
-}
-
 .video-grid-row {
   display: flex;
   flex-direction: row;
@@ -441,6 +458,10 @@ ul {
 .text-center {
   text-align: center;
 }
+.inline-block {
+  display: inline-block;
+  vertical-align: middle;
+}
 
 /*********************************
 *       Margin and Padding       *
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js');