Update app to incorporate sigcrafting inventory endpoints

docker-compose.yml

@@ -24,7 +24,7 @@ services:
     depends_on:
       - postgres
     ports:
-      - "4504:4504"
+      - "443:443"
     working_dir: /server2
     volumes:
         - ./server2:/server2
@@ -35,15 +35,17 @@ services:
         max-size: "1m"
         max-file: "3"
 
-        
-  imgparser:
-    build: imgparser
-    restart: always
+  server3:
+    build: server3
+    depends_on:
+      - postgres
     ports:
-      - "4503:4503"
+      - "4505:4505"
+    working_dir: /server3
     volumes:
-        - ./imgparser:/imgparser
-    working_dir: /imgparser/projectDivaImgParser
+        - ./server3:/server3
+    env_file:
+        - ./server/.env.twitter
     logging:
       options:
         max-size: "1m"
@@ -74,7 +76,7 @@ services:
       - postgres
       - server
     ports:
-      - "80:3000"
+      - "4500:3000"
     environment:
       - CHOKIDAR_USEPOLLING=true
     stdin_open: true
@@ -89,6 +91,30 @@ services:
         max-size: "1m"
         max-file: "3"
 
+  sigcrafting:
+    build: 
+        context: sigcrafting
+        dockerfile: Dockerfile
+    restart: on-failure
+    depends_on:
+      - postgres
+      - server
+    ports:
+      - "3001:3001"
+    environment:
+      - CHOKIDAR_USEPOLLING=true
+    stdin_open: true
+    working_dir: /sigcrafting
+    env_file:
+        - ./sigcrafting/.env
+    volumes:
+        - /app/node_modules
+        - ./sigcrafting:/sigcrafting
+    logging:
+      options:
+        max-size: "1m"
+        max-file: "3"
+        
       
 #  prod-frontend:
 #    build:

frontend/src/App.js

@@ -842,7 +842,7 @@ function BestPlaysPanel(p) {
 	var [update,setUpdate] = useState(false)
 	
 	useEffect(()=>{
-		axios.get("http://www.projectdivar.com/bestplays/"+p.username+"?fails=false&limit=5&offset=0")
+		axios.get("http://projectdivar.com/bestplays/"+p.username+"?fails=false&limit=5&offset=0")
 		.then((data)=>{setBestPlays(data.data);})
 	},[p.profileUpdate,update,p.username])
 	
@@ -851,7 +851,7 @@ function BestPlaysPanel(p) {
 			{bestPlays.map((play,i)=>{return <li key={i} className={"list-group-item list-group-item-action "+(i%2==0?"background-list-1":"background-list-2")}>
 					<Play setModalSrc={p.setModalSrc} setModalVisible={p.setModalVisible} index={i} play={play} song={p.songs[play.songid]}/>
 				</li>})}
-			<LoadMore username={p.username} profileUpdate={p.profileUpdate} listItem={true} url={"http://www.projectdivar.com/bestplays/"+p.username} params={{fails:false,limit:15,offset:5}} value={bestPlays} setValue={setBestPlays}/>
+			<LoadMore username={p.username} profileUpdate={p.profileUpdate} listItem={true} url={"http://projectdivar.com/bestplays/"+p.username} params={{fails:false,limit:15,offset:5}} value={bestPlays} setValue={setBestPlays}/>
 			</ul>
 		</div>
 	
@@ -948,7 +948,7 @@ function PlayData(p) {
 			<h5>Individual Plays for {p.song.name} from {p.username}</h5>
 			<div className="border rounded">
 				{data.map((play,i)=><Play setModalSrc={p.setModalSrc} setModalVisible={p.setModalVisible} key={i} play={play} mini={true} song={p.song}/>)}
-				<LoadMore profileUpdate={p.profileUpdate} username={p.username} url={"http://www.projectdivar.com/plays/"+p.username+"/"+p.song.id} params={{limit:15,offset:5}} value={data} setValue={setData}/>
+				<LoadMore profileUpdate={p.profileUpdate} username={p.username} url={"http://projectdivar.com/plays/"+p.username+"/"+p.song.id} params={{limit:15,offset:5}} value={data} setValue={setData}/>
 			</div>
 		</div>
 	</>
@@ -2407,7 +2407,7 @@ function Website() {
 	const [userSettings,setUserSettings] = useState({})
 	
 	useEffect(()=>{
-		axios.get("http://www.projectdivar.com/songs")
+		axios.get("http://.projectdivar.com/songs")
 		.then((data)=>{
 			setSongs(data.data)
 		})

frontend/src/setupProxy.js

@@ -1,6 +1,6 @@
 const { createProxyMiddleware } = require('http-proxy-middleware');
 
-module.exports = function(app) {
+module.exports = function (app) {
     /*app.use(
         "/event/query",
         createProxyMiddleware({
@@ -8,6 +8,20 @@ module.exports = function(app) {
           changeOrigin: true,
         })
         );*/
+    app.use(
+        "/sigcrafting",
+        createProxyMiddleware({
+            target: 'http://server:3001',
+            changeOrigin: true,
+        })
+    );
+        app.use(
+        "/gitea",
+        createProxyMiddleware({
+                target: 'http://sig.projectdivar.com',
+                changeOrigin:false,
+        })
+        );
     app.use(
         "/ngsplanner/class",
         createProxyMiddleware({
@@ -169,6 +183,20 @@ module.exports = function(app) {
             changeOrigin: true,
         })
     );
+    app.use(
+        "/create-event",
+        createProxyMiddleware({
+            target: 'http://server:4501',
+            changeOrigin: true,
+        })
+    );
+    app.use(
+        "/event/leaderboard",
+        createProxyMiddleware({
+            target: 'http://server:4501',
+            changeOrigin: true,
+        })
+    );
     app.use(
         "/eventsubmit",
         createProxyMiddleware({